autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-05 14:38:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

分账明细查询

Browse Source
This commit is contained in:
Guoqs
2025-03-24 11:08:24 +08:00
parent 2c7a206e2a
commit b5d7c188a7
4 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
View File

@@ -39,4 +39,6 @@ public interface OrderSplitRecordMapper {
* @return * @return
*/ */
List<OrderSplitRecord> queryByOrderCodeList(@Param("orderCodeList") List<String> orderCodeList); List<OrderSplitRecord> queryByOrderCodeList(@Param("orderCodeList") List<String> orderCodeList);
}
List<OrderSplitRecord> queryOrderSplitRecordByMemberId(@Param("adapayMemberId") String adapayMemberId, @Param("startTime") String startTime, @Param("endTime") String endTime);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
View File

@@ -68,5 +68,10 @@ public interface OrderSplitRecordService {
* @return * @return
*/ */
List<SplitOrdersInfoVO> getSplitOrdersInfoList(SplitOrderDTO dto); List<SplitOrdersInfoVO> getSplitOrdersInfoList(SplitOrderDTO dto);
/**
* 根据汇付会员id查询时间段内东单分账记录
*/
List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime);
} }

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -251,6 +251,11 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
return null; return null;
} }
@Override
public List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime) {
return orderSplitRecordMapper.queryOrderSplitRecordByMemberId(adapayMemberId, startTime, endTime);
}
/** /**
* 根据merchantId, 查询从他人分账的金额 * 根据merchantId, 查询从他人分账的金额
* extra income * extra income

45
jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
View File

@@ -30,14 +30,14 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount, id, order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount,
service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio, service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio,
electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, electricity_split_amount, service_split_ratio, service_split_amount, fee_amount,
remark, create_by, create_time, update_by, update_time, del_flag remark, create_by, create_time, update_by, update_time, del_flag
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated--> <!--@mbg.generated-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from order_split_record from order_split_record
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
@@ -427,20 +427,20 @@
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true"> <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into order_split_record insert into order_split_record
(order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount, (order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount,
service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio, service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio,
electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, electricity_split_amount, service_split_ratio, service_split_amount, fee_amount,
remark, create_by, create_time, update_by, update_time, del_flag) remark, create_by, create_time, update_by, update_time, del_flag)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.orderCode,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, (#{item.orderCode,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR},
#{item.status,jdbcType=VARCHAR}, #{item.settleAmount,jdbcType=DECIMAL}, #{item.electricityAmount,jdbcType=DECIMAL}, #{item.status,jdbcType=VARCHAR}, #{item.settleAmount,jdbcType=DECIMAL}, #{item.electricityAmount,jdbcType=DECIMAL},
#{item.serviceAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR}, #{item.adapayMemberId,jdbcType=VARCHAR}, #{item.serviceAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR}, #{item.adapayMemberId,jdbcType=VARCHAR},
#{item.paymentId,jdbcType=VARCHAR}, #{item.paymentConfirmId,jdbcType=VARCHAR}, #{item.paymentId,jdbcType=VARCHAR}, #{item.paymentConfirmId,jdbcType=VARCHAR},
#{item.electricitySplitRatio,jdbcType=DECIMAL}, #{item.electricitySplitAmount,jdbcType=DECIMAL}, #{item.electricitySplitRatio,jdbcType=DECIMAL}, #{item.electricitySplitAmount,jdbcType=DECIMAL},
#{item.serviceSplitRatio,jdbcType=DECIMAL}, #{item.serviceSplitAmount,jdbcType=DECIMAL}, #{item.serviceSplitRatio,jdbcType=DECIMAL}, #{item.serviceSplitAmount,jdbcType=DECIMAL},
#{item.feeAmount,jdbcType=DECIMAL}, #{item.remark,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, #{item.feeAmount,jdbcType=DECIMAL}, #{item.remark,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR},
#{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
#{item.delFlag,jdbcType=VARCHAR}) #{item.delFlag,jdbcType=VARCHAR})
</foreach> </foreach>
</insert> </insert>
@@ -502,7 +502,7 @@
#{updateTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{delFlag,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR},
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
@@ -677,7 +677,7 @@
#{delFlag,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR},
</if> </if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
@@ -780,6 +780,15 @@
and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
</select> </select>
<select id="queryOrderSplitRecordByMemberId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_split_record
where del_flag = '0'
and adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}
and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
</select>
<select id="queryByOrderCodeList" resultMap="BaseResultMap"> <select id="queryByOrderCodeList" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
@@ -790,4 +799,4 @@
#{item} #{item}
</foreach> </foreach>
</select> </select>
</mapper> </mapper>