diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java new file mode 100644 index 000000000..9b6627d1c --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java @@ -0,0 +1,47 @@ +package com.jsowell.web.controller.pile; + +import com.google.common.collect.ImmutableMap; +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.response.RestApiResponse; +import com.jsowell.pile.dto.QueryOrderSplitRecordDTO; +import com.jsowell.pile.service.OrderSplitRecordService; +import com.jsowell.pile.vo.web.OrderSplitRecordVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 订单分账记录Controller + * + * @author Lemon + * @Date 2025/7/29 10:21:54 + */ +@RestController +@RequestMapping("/order/commission") +public class OrderSplitRecordController extends BaseController { + + @Autowired + private OrderSplitRecordService orderSplitRecordService; + + /** + * 后管查询引流抽成订单列表 + * @param dto + * @return + */ + @PostMapping("/getStationCommissionList") + public RestApiResponse getStationCommissionList(@RequestBody QueryOrderSplitRecordDTO dto) { + RestApiResponse response = null; + try { + List stationCommissionList = orderSplitRecordService.getStationCommissionList(dto); + response = new RestApiResponse<>(ImmutableMap.of("stationCommissionList", stationCommissionList)); + }catch (Exception e) { + logger.error("查询站点引流抽成订单列表 error", e); + response = new RestApiResponse<>(e); + } + return response; + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderSplitRecordDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderSplitRecordDTO.java new file mode 100644 index 000000000..54c5f2235 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderSplitRecordDTO.java @@ -0,0 +1,31 @@ +package com.jsowell.pile.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 查询站点引流抽成订单列表DTO + * + * @author Lemon + * @Date 2025/7/29 10:38:58 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class QueryOrderSplitRecordDTO { + + private Integer pageNum; + private Integer pageSize; + + private String startTime; + private String endTime; + + private String stationId; + + private String orderCode; + + private String transactionCode; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java index 15ddfde3b..3a74c95ea 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java @@ -2,6 +2,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.dto.QueryOrderSplitDTO; +import com.jsowell.pile.dto.QueryOrderSplitRecordDTO; import com.jsowell.pile.dto.SplitConfigStationDTO; import com.jsowell.pile.vo.web.OrderSplitRecordVO; import com.jsowell.pile.vo.web.SplitAggregateDataVO; @@ -61,4 +62,11 @@ public interface OrderSplitRecordMapper { List queryStationAggregateData(@Param("dto") SplitConfigStationDTO dto); List selectInfoByPaymentConfirmId(String paymentConfirmId); + + /** + * 后管配置引流抽成页面查询订单列表 + * @param dto + * @return + */ + List getStationCommissionList(@Param("dto") QueryOrderSplitRecordDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java index c66b10d95..d9ec72eb3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java @@ -7,6 +7,7 @@ import com.jsowell.adapay.response.PaymentConfirmResponse; import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.dto.QueryOrderSplitDTO; +import com.jsowell.pile.dto.QueryOrderSplitRecordDTO; import com.jsowell.pile.dto.SplitConfigStationDTO; import com.jsowell.pile.dto.SplitOrderDTO; import com.jsowell.pile.vo.OrderInfoDetailVO; @@ -99,5 +100,12 @@ public interface OrderSplitRecordService { * @param paymentConfirmId */ String confirmReverseByPaymentConfirmId(String paymentConfirmId) throws BaseAdaPayException; + + /** + * 后管配置引流抽成页面订单列表 + * @param dto + * @return + */ + List getStationCommissionList(QueryOrderSplitRecordDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 0906881dc..457dfda9f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -17,12 +17,14 @@ import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.AdapayMemberAccount; import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.QueryOrderSplitDTO; +import com.jsowell.pile.dto.QueryOrderSplitRecordDTO; import com.jsowell.pile.dto.SplitConfigStationDTO; import com.jsowell.pile.dto.SplitOrderDTO; import com.jsowell.pile.mapper.OrderSplitRecordMapper; @@ -560,6 +562,29 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { return status; } + /** + * 后管配置引流抽成页面查询订单列表 + * @param dto + * @return + */ + @Override + public List getStationCommissionList(QueryOrderSplitRecordDTO dto) { + int pageNo = dto.getPageNum() == null ? 1 : dto.getPageNum(); + int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); + // 分页 + PageUtils.startPage(pageNo, pageSize); + List stationCommissionList = orderSplitRecordMapper.getStationCommissionList(dto); + if (CollectionUtils.isEmpty(stationCommissionList)) { + return new ArrayList<>(); + } + for (OrderSplitRecordVO orderSplitRecordVO : stationCommissionList) { + // 计算 抽成总金额 = 抽成电费 + 抽成服务费 + BigDecimal commissionAmount = orderSplitRecordVO.getElectricitySplitAmount().add(orderSplitRecordVO.getServiceSplitAmount()); + orderSplitRecordVO.setCommissionAmount(commissionAmount); + } + return stationCommissionList; + } + /** * 根据汇付会员id查询分账汇总数据 * @param dto diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java index 2ad0286db..d3472ba63 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java @@ -11,6 +11,8 @@ public class OrderSplitRecordVO { */ private String orderCode; + private String transactionCode; + /** * 站点id */ @@ -42,6 +44,11 @@ public class OrderSplitRecordVO { */ private BigDecimal settleAmount; + /** + * 订单抽成总金额 + */ + private BigDecimal commissionAmount; + /** * 订单电费金额 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml index e218b506a..2cb94368a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml @@ -1,893 +1,925 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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, - electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, - remark, create_by, create_time, update_by, update_time, del_flag - - - - - delete from order_split_record - where id = #{id,jdbcType=INTEGER} - - - - insert into order_split_record - - - 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, - - - electricity_split_amount, - - - service_split_ratio, - - - service_split_amount, - - - fee_amount, - - - remark, - - - create_by, - - - create_time, - - - update_by, - - - update_time, - - - del_flag, - - - - - #{orderCode,jdbcType=VARCHAR}, - - - #{merchantId,jdbcType=VARCHAR}, - - - #{stationId,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{settleAmount,jdbcType=DECIMAL}, - - - #{electricityAmount,jdbcType=DECIMAL}, - - - #{serviceAmount,jdbcType=DECIMAL}, - - - #{tradeDate,jdbcType=VARCHAR}, - - - #{adapayMemberId,jdbcType=VARCHAR}, - - - #{paymentId,jdbcType=VARCHAR}, - - - #{paymentConfirmId,jdbcType=VARCHAR}, - - - #{electricitySplitRatio,jdbcType=DECIMAL}, - - - #{electricitySplitAmount,jdbcType=DECIMAL}, - - - #{serviceSplitRatio,jdbcType=DECIMAL}, - - - #{serviceSplitAmount,jdbcType=DECIMAL}, - - - #{feeAmount,jdbcType=DECIMAL}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{delFlag,jdbcType=VARCHAR}, - - - - - - update order_split_record - - - order_code = #{orderCode,jdbcType=VARCHAR}, - - - merchant_id = #{merchantId,jdbcType=VARCHAR}, - - - station_id = #{stationId,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - settle_amount = #{settleAmount,jdbcType=DECIMAL}, - - - electricity_amount = #{electricityAmount,jdbcType=DECIMAL}, - - - service_amount = #{serviceAmount,jdbcType=DECIMAL}, - - - trade_date = #{tradeDate,jdbcType=VARCHAR}, - - - adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}, - - - payment_id = #{paymentId,jdbcType=VARCHAR}, - - - payment_confirm_id = #{paymentConfirmId,jdbcType=VARCHAR}, - - - electricity_split_ratio = #{electricitySplitRatio,jdbcType=DECIMAL}, - - - electricity_split_amount = #{electricitySplitAmount,jdbcType=DECIMAL}, - - - service_split_ratio = #{serviceSplitRatio,jdbcType=DECIMAL}, - - - service_split_amount = #{serviceSplitAmount,jdbcType=DECIMAL}, - - - fee_amount = #{feeAmount,jdbcType=DECIMAL}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - del_flag = #{delFlag,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update order_split_record - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, + electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, + remark, create_by, create_time, update_by, update_time, del_flag + + + + + delete from order_split_record + where id = #{id,jdbcType=INTEGER} + + + + insert into order_split_record + + + 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, + + + electricity_split_amount, + + + service_split_ratio, + + + service_split_amount, + + + fee_amount, + + + remark, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + del_flag, + + + + + #{orderCode,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{stationId,jdbcType=VARCHAR}, + + + #{status,jdbcType=VARCHAR}, + + + #{settleAmount,jdbcType=DECIMAL}, + + + #{electricityAmount,jdbcType=DECIMAL}, + + + #{serviceAmount,jdbcType=DECIMAL}, + + + #{tradeDate,jdbcType=VARCHAR}, + + + #{adapayMemberId,jdbcType=VARCHAR}, + + + #{paymentId,jdbcType=VARCHAR}, + + + #{paymentConfirmId,jdbcType=VARCHAR}, + + + #{electricitySplitRatio,jdbcType=DECIMAL}, + + + #{electricitySplitAmount,jdbcType=DECIMAL}, + + + #{serviceSplitRatio,jdbcType=DECIMAL}, + + + #{serviceSplitAmount,jdbcType=DECIMAL}, + + + #{feeAmount,jdbcType=DECIMAL}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=VARCHAR}, + + + + + + update order_split_record + + + order_code = #{orderCode,jdbcType=VARCHAR}, + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + station_id = #{stationId,jdbcType=VARCHAR}, + + + `status` = #{status,jdbcType=VARCHAR}, + + + settle_amount = #{settleAmount,jdbcType=DECIMAL}, + + + electricity_amount = #{electricityAmount,jdbcType=DECIMAL}, + + + service_amount = #{serviceAmount,jdbcType=DECIMAL}, + + + trade_date = #{tradeDate,jdbcType=VARCHAR}, + + + adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}, + + + payment_id = #{paymentId,jdbcType=VARCHAR}, + + + payment_confirm_id = #{paymentConfirmId,jdbcType=VARCHAR}, + + + electricity_split_ratio = #{electricitySplitRatio,jdbcType=DECIMAL}, + + + electricity_split_amount = #{electricitySplitAmount,jdbcType=DECIMAL}, + + + service_split_ratio = #{serviceSplitRatio,jdbcType=DECIMAL}, + + + service_split_amount = #{serviceSplitAmount,jdbcType=DECIMAL}, + + + fee_amount = #{feeAmount,jdbcType=DECIMAL}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + + update order_split_record + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.status,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.electricityAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.serviceAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.adapayMemberId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.paymentId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.paymentConfirmId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.electricitySplitRatio,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.electricitySplitAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.serviceSplitRatio,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.serviceSplitAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.feeAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.remark,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=VARCHAR} + + + + + where id in + + #{item.id,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR} - + + + + insert into order_split_record + (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, + electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, + remark, create_by, create_time, update_by, update_time, del_flag) + values + + (#{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.serviceAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR}, + #{item.adapayMemberId,jdbcType=VARCHAR}, + #{item.paymentId,jdbcType=VARCHAR}, #{item.paymentConfirmId,jdbcType=VARCHAR}, + #{item.electricitySplitRatio,jdbcType=DECIMAL}, #{item.electricitySplitAmount,jdbcType=DECIMAL}, + #{item.serviceSplitRatio,jdbcType=DECIMAL}, #{item.serviceSplitAmount,jdbcType=DECIMAL}, + #{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.delFlag,jdbcType=VARCHAR}) - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.status,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.electricityAmount,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.serviceAmount,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adapayMemberId,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.paymentId,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.paymentConfirmId,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.electricitySplitRatio,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.electricitySplitAmount,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.serviceSplitRatio,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.serviceSplitAmount,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.feeAmount,jdbcType=DECIMAL} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into order_split_record - (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, - electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, - remark, create_by, create_time, update_by, update_time, del_flag) - values - - (#{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.serviceAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR}, #{item.adapayMemberId,jdbcType=VARCHAR}, - #{item.paymentId,jdbcType=VARCHAR}, #{item.paymentConfirmId,jdbcType=VARCHAR}, - #{item.electricitySplitRatio,jdbcType=DECIMAL}, #{item.electricitySplitAmount,jdbcType=DECIMAL}, - #{item.serviceSplitRatio,jdbcType=DECIMAL}, #{item.serviceSplitAmount,jdbcType=DECIMAL}, - #{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.delFlag,jdbcType=VARCHAR}) - - - - - insert into order_split_record - - - 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, - electricity_split_amount, - service_split_ratio, - service_split_amount, - fee_amount, - remark, - create_by, - create_time, - update_by, - update_time, - del_flag, - - values - - - #{id,jdbcType=INTEGER}, - - #{orderCode,jdbcType=VARCHAR}, - #{merchantId,jdbcType=VARCHAR}, - #{stationId,jdbcType=VARCHAR}, - #{status,jdbcType=VARCHAR}, - #{settleAmount,jdbcType=DECIMAL}, - #{electricityAmount,jdbcType=DECIMAL}, - #{serviceAmount,jdbcType=DECIMAL}, - #{tradeDate,jdbcType=VARCHAR}, - #{adapayMemberId,jdbcType=VARCHAR}, - #{paymentId,jdbcType=VARCHAR}, - #{paymentConfirmId,jdbcType=VARCHAR}, - #{electricitySplitRatio,jdbcType=DECIMAL}, - #{electricitySplitAmount,jdbcType=DECIMAL}, - #{serviceSplitRatio,jdbcType=DECIMAL}, - #{serviceSplitAmount,jdbcType=DECIMAL}, - #{feeAmount,jdbcType=DECIMAL}, - #{remark,jdbcType=VARCHAR}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, - #{delFlag,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - order_code = #{orderCode,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - station_id = #{stationId,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=VARCHAR}, - settle_amount = #{settleAmount,jdbcType=DECIMAL}, - electricity_amount = #{electricityAmount,jdbcType=DECIMAL}, - service_amount = #{serviceAmount,jdbcType=DECIMAL}, - trade_date = #{tradeDate,jdbcType=VARCHAR}, - adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}, - payment_id = #{paymentId,jdbcType=VARCHAR}, - payment_confirm_id = #{paymentConfirmId,jdbcType=VARCHAR}, - electricity_split_ratio = #{electricitySplitRatio,jdbcType=DECIMAL}, - electricity_split_amount = #{electricitySplitAmount,jdbcType=DECIMAL}, - service_split_ratio = #{serviceSplitRatio,jdbcType=DECIMAL}, - service_split_amount = #{serviceSplitAmount,jdbcType=DECIMAL}, - fee_amount = #{feeAmount,jdbcType=DECIMAL}, - remark = #{remark,jdbcType=VARCHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - del_flag = #{delFlag,jdbcType=VARCHAR}, - - - - - insert into order_split_record - - - 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, - - - electricity_split_amount, - - - service_split_ratio, - - - service_split_amount, - - - fee_amount, - - - remark, - - - create_by, - - - create_time, - - - update_by, - - - update_time, - - - del_flag, - - - values - - - #{id,jdbcType=INTEGER}, - - - #{orderCode,jdbcType=VARCHAR}, - - - #{merchantId,jdbcType=VARCHAR}, - - - #{stationId,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{settleAmount,jdbcType=DECIMAL}, - - - #{electricityAmount,jdbcType=DECIMAL}, - - - #{serviceAmount,jdbcType=DECIMAL}, - - - #{tradeDate,jdbcType=VARCHAR}, - - - #{adapayMemberId,jdbcType=VARCHAR}, - - - #{paymentId,jdbcType=VARCHAR}, - - - #{paymentConfirmId,jdbcType=VARCHAR}, - - - #{electricitySplitRatio,jdbcType=DECIMAL}, - - - #{electricitySplitAmount,jdbcType=DECIMAL}, - - - #{serviceSplitRatio,jdbcType=DECIMAL}, - - - #{serviceSplitAmount,jdbcType=DECIMAL}, - - - #{feeAmount,jdbcType=DECIMAL}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{delFlag,jdbcType=VARCHAR}, - - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - - order_code = #{orderCode,jdbcType=VARCHAR}, - - - merchant_id = #{merchantId,jdbcType=VARCHAR}, - - - station_id = #{stationId,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - settle_amount = #{settleAmount,jdbcType=DECIMAL}, - - - electricity_amount = #{electricityAmount,jdbcType=DECIMAL}, - - - service_amount = #{serviceAmount,jdbcType=DECIMAL}, - - - trade_date = #{tradeDate,jdbcType=VARCHAR}, - - - adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}, - - - payment_id = #{paymentId,jdbcType=VARCHAR}, - - - payment_confirm_id = #{paymentConfirmId,jdbcType=VARCHAR}, - - - electricity_split_ratio = #{electricitySplitRatio,jdbcType=DECIMAL}, - - - electricity_split_amount = #{electricitySplitAmount,jdbcType=DECIMAL}, - - - service_split_ratio = #{serviceSplitRatio,jdbcType=DECIMAL}, - - - service_split_amount = #{serviceSplitAmount,jdbcType=DECIMAL}, - - - fee_amount = #{feeAmount,jdbcType=DECIMAL}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - del_flag = #{delFlag,jdbcType=VARCHAR}, - - - + + + + insert into order_split_record + + + 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, + electricity_split_amount, + service_split_ratio, + service_split_amount, + fee_amount, + remark, + create_by, + create_time, + update_by, + update_time, + del_flag, + + values + + + #{id,jdbcType=INTEGER}, + + #{orderCode,jdbcType=VARCHAR}, + #{merchantId,jdbcType=VARCHAR}, + #{stationId,jdbcType=VARCHAR}, + #{status,jdbcType=VARCHAR}, + #{settleAmount,jdbcType=DECIMAL}, + #{electricityAmount,jdbcType=DECIMAL}, + #{serviceAmount,jdbcType=DECIMAL}, + #{tradeDate,jdbcType=VARCHAR}, + #{adapayMemberId,jdbcType=VARCHAR}, + #{paymentId,jdbcType=VARCHAR}, + #{paymentConfirmId,jdbcType=VARCHAR}, + #{electricitySplitRatio,jdbcType=DECIMAL}, + #{electricitySplitAmount,jdbcType=DECIMAL}, + #{serviceSplitRatio,jdbcType=DECIMAL}, + #{serviceSplitAmount,jdbcType=DECIMAL}, + #{feeAmount,jdbcType=DECIMAL}, + #{remark,jdbcType=VARCHAR}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + order_code = #{orderCode,jdbcType=VARCHAR}, + merchant_id = #{merchantId,jdbcType=VARCHAR}, + station_id = #{stationId,jdbcType=VARCHAR}, + `status` = #{status,jdbcType=VARCHAR}, + settle_amount = #{settleAmount,jdbcType=DECIMAL}, + electricity_amount = #{electricityAmount,jdbcType=DECIMAL}, + service_amount = #{serviceAmount,jdbcType=DECIMAL}, + trade_date = #{tradeDate,jdbcType=VARCHAR}, + adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}, + payment_id = #{paymentId,jdbcType=VARCHAR}, + payment_confirm_id = #{paymentConfirmId,jdbcType=VARCHAR}, + electricity_split_ratio = #{electricitySplitRatio,jdbcType=DECIMAL}, + electricity_split_amount = #{electricitySplitAmount,jdbcType=DECIMAL}, + service_split_ratio = #{serviceSplitRatio,jdbcType=DECIMAL}, + service_split_amount = #{serviceSplitAmount,jdbcType=DECIMAL}, + fee_amount = #{feeAmount,jdbcType=DECIMAL}, + remark = #{remark,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=VARCHAR}, + + + + + insert into order_split_record + + + 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, + + + electricity_split_amount, + + + service_split_ratio, + + + service_split_amount, + + + fee_amount, + + + remark, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + del_flag, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{orderCode,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{stationId,jdbcType=VARCHAR}, + + + #{status,jdbcType=VARCHAR}, + + + #{settleAmount,jdbcType=DECIMAL}, + + + #{electricityAmount,jdbcType=DECIMAL}, + + + #{serviceAmount,jdbcType=DECIMAL}, + + + #{tradeDate,jdbcType=VARCHAR}, + + + #{adapayMemberId,jdbcType=VARCHAR}, + + + #{paymentId,jdbcType=VARCHAR}, + + + #{paymentConfirmId,jdbcType=VARCHAR}, + + + #{electricitySplitRatio,jdbcType=DECIMAL}, + + + #{electricitySplitAmount,jdbcType=DECIMAL}, + + + #{serviceSplitRatio,jdbcType=DECIMAL}, + + + #{serviceSplitAmount,jdbcType=DECIMAL}, + + + #{feeAmount,jdbcType=DECIMAL}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=VARCHAR}, + + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + + order_code = #{orderCode,jdbcType=VARCHAR}, + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + station_id = #{stationId,jdbcType=VARCHAR}, + + + `status` = #{status,jdbcType=VARCHAR}, + + + settle_amount = #{settleAmount,jdbcType=DECIMAL}, + + + electricity_amount = #{electricityAmount,jdbcType=DECIMAL}, + + + service_amount = #{serviceAmount,jdbcType=DECIMAL}, + + + trade_date = #{tradeDate,jdbcType=VARCHAR}, + + + adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}, + + + payment_id = #{paymentId,jdbcType=VARCHAR}, + + + payment_confirm_id = #{paymentConfirmId,jdbcType=VARCHAR}, + + + electricity_split_ratio = #{electricitySplitRatio,jdbcType=DECIMAL}, + + + electricity_split_amount = #{electricitySplitAmount,jdbcType=DECIMAL}, + + + service_split_ratio = #{serviceSplitRatio,jdbcType=DECIMAL}, + + + service_split_amount = #{serviceSplitAmount,jdbcType=DECIMAL}, + + + fee_amount = #{feeAmount,jdbcType=DECIMAL}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=VARCHAR}, + + + - + - + - + - + - + - + SELECT + t1.order_code AS orderCode, + t2.settlement_time as settlementTime, + t1.station_id AS stationId, + t2.order_amount AS orderAmount, + t1.settle_amount AS settleAmount, + t1.adapay_member_id AS adapayMemberId, + t4.id as merchantId, + t4.merchant_name as merchantName, + t1.payment_id as paymentId, + t1.payment_confirm_id as paymentConfirmId, + t1.electricity_split_ratio AS electricitySplitRatio, + t1.electricity_split_amount AS electricitySplitAmount, + t1.service_split_ratio AS serviceSplitRatio, + t1.service_split_amount AS serviceSplitAmount, + t1.fee_amount AS feeAmount + FROM + order_split_record t1 JOIN order_basic_info t2 ON t1.order_code = t2.order_code AND t1.del_flag = '0' join adapay_member_account t3 on t1.adapay_member_id = t3.adapay_member_id - join pile_merchant_info t4 on t3.merchant_id = t4.id - WHERE - t1.order_code in - - #{orderCode} - - + join pile_merchant_info t4 on t3.merchant_id = t4.id + WHERE + t1.order_code in + + #{orderCode} + + - + - + SELECT t1.station_id AS stationId, t2.station_name AS stationName, count(t1.id) as orderCount, sum(t1.electricity_split_amount) AS totalElectricitySplitAmount, sum(t1.service_split_amount) AS totalServiceSplitAmount, sum(t1.fee_amount) AS totalFeeAmount - FROM - order_split_record t1 + FROM + order_split_record t1 JOIN pile_station_info t2 ON t1.station_id = t2.id AND t1.del_flag = '0' - WHERE - t1.trade_date BETWEEN #{dto.startTime,jdbcType=VARCHAR} + WHERE + t1.trade_date BETWEEN #{dto.startTime,jdbcType=VARCHAR} AND #{dto.endTime,jdbcType=VARCHAR} - AND t1.adapay_member_id = #{dto.adapayMemberId,jdbcType=VARCHAR} - - and t1.station_id = #{dto.stationId,jdbcType=VARCHAR} - - group by t1.station_id - + AND t1.adapay_member_id = #{dto.adapayMemberId,jdbcType=VARCHAR} + + and t1.station_id = #{dto.stationId,jdbcType=VARCHAR} + + group by t1.station_id + - + SELECT + t2.station_id AS stationId, + t3.station_name AS stationName, + t1.electricity_amount AS electricityAmount, + t1.service_amount AS serviceAmount, + t1.fee_amount AS feeAmount, + t1.trade_date AS tradeDate + FROM + order_split_record t1 JOIN order_basic_info t2 ON t1.order_code = t2.order_code JOIN pile_station_info t3 ON t1.station_id = t3.id - WHERE - t1.adapay_member_id = #{adapayMemberId} - AND t1.del_flag = '0' - AND t1.trade_date BETWEEN #{startTime,jdbcType=VARCHAR} AND #{endTime,jdbcType=VARCHAR} - - and t1.station_id = #{dto.stationId,jdbcType=VARCHAR} - - + WHERE + t1.adapay_member_id = #{adapayMemberId} + AND t1.del_flag = '0' + AND t1.trade_date BETWEEN #{startTime,jdbcType=VARCHAR} AND #{endTime,jdbcType=VARCHAR} + + and t1.station_id = #{dto.stationId,jdbcType=VARCHAR} + + - + + +