diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index fcd93e38b..ac7be34e1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -15,6 +15,7 @@ import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.OrderBasicInfoService; +import com.jsowell.pile.service.OrderSplitRecordService; import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.util.UserUtils; @@ -50,6 +51,9 @@ public class OrderBasicInfoController extends BaseController { @Autowired private PileStationInfoService pileStationInfoService; + @Autowired + private OrderSplitRecordService orderSplitRecordService; + /** * 查询订单列表 * 订单列表页,带数据权限校验 @@ -224,4 +228,21 @@ public class OrderBasicInfoController extends BaseController { } return response; } + + /** + * 查询订单分账数据 + * @param dto + * @return + */ + @PostMapping("/queryOrderSplitData") + public RestApiResponse queryOrderSplitData(@RequestBody QueryOrderSplitDTO dto) { + RestApiResponse response = null; + try { + orderSplitRecordService.queryOrderSplitData(dto); + } catch (Exception e) { + + } + logger.info("查询订单分账数据 params:{}, result:{}", JSON.toJSONString(dto), response); + return response; + } } diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index e8e252e12..306a89de8 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -246,4 +246,9 @@ parking: # 车场ID(分配) parkId: 61578 # 机构ID(分配) - orgId: BTTEST01 \ No newline at end of file + orgId: BTTEST01 + +# 充电算法平台配置 +chargeAlgorithm: + url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json + clientId: e488bac5f70b496fa2d82065089e5f81 \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index fbdb433f9..ceae04173 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -241,4 +241,9 @@ parking: # 车场ID(分配) parkId: 66291 # 机构ID(分配) - orgId: DCWYPROD20250210 \ No newline at end of file + orgId: DCWYPROD20250210 + +# 充电算法平台配置 +chargeAlgorithm: + url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json + clientId: e488bac5f70b496fa2d82065089e5f81 \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index b2f1938a0..6591137a0 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -244,4 +244,9 @@ parking: # 车场ID(分配) parkId: 61578 # 机构ID(分配) - orgId: BTTEST01 \ No newline at end of file + orgId: BTTEST01 + +# 充电算法平台配置 +chargeAlgorithm: + url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json + clientId: e488bac5f70b496fa2d82065089e5f81 \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index a11aaecb3..d2f6547e7 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -126,3 +126,8 @@ wulian: getSimInfo: api.v2.card.info WuLianSimRenew: api.v2.order.renew +# 充电算法平台配置 +chargeAlgorithm: + url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json + clientId: e488bac5f70b496fa2d82065089e5f81 + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderSplitDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderSplitDTO.java new file mode 100644 index 000000000..3e90e76d6 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderSplitDTO.java @@ -0,0 +1,44 @@ +package com.jsowell.pile.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 查询订单分润DTO + * + * @author Lemon + * @Date 2025/4/11 10:15:51 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class QueryOrderSplitDTO { + private int pageNo; + private int pageSize; + + /** + * 站点id + */ + private String stationId; + + /** + * 汇付会员id + */ + private String adapayMemberId; + + /** + * 开始时间 + * 默认本月1号 + */ + private String startTime; + + /** + * 结束时间 + * 默认今天日期 + */ + private String endTime; + +} 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 8cc30d15c..609c1082e 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 @@ -1,6 +1,8 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderSplitRecord; +import com.jsowell.pile.dto.QueryOrderSplitDTO; +import com.jsowell.pile.vo.web.OrderSplitRecordVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,4 +43,6 @@ public interface OrderSplitRecordMapper { List queryByOrderCodeList(@Param("orderCodeList") List orderCodeList); List queryOrderSplitRecordByMemberId(@Param("adapayMemberId") String adapayMemberId, @Param("startTime") String startTime, @Param("endTime") String endTime); + + List queryOrderSplitData(@Param("dto") QueryOrderSplitDTO 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 e74f34bc4..c519903be 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 @@ -4,6 +4,7 @@ import com.jsowell.adapay.dto.PaymentConfirmParam; import com.jsowell.adapay.dto.SplitData; import com.jsowell.adapay.response.PaymentConfirmResponse; import com.jsowell.pile.domain.OrderSplitRecord; +import com.jsowell.pile.dto.QueryOrderSplitDTO; import com.jsowell.pile.dto.SplitOrderDTO; import com.jsowell.pile.vo.OrderInfoDetailVO; import com.jsowell.pile.vo.web.OrderSplitDailySummaryData; @@ -69,8 +70,10 @@ public interface OrderSplitRecordService { */ List getSplitOrdersInfoList(SplitOrderDTO dto); + public List queryOrderSplitData(QueryOrderSplitDTO dto); + /** - * 根据汇付会员id查询时间段内东单分账记录 + * 根据汇付会员id查询时间段内订单分账记录 */ List queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime); } 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 985a44e22..46885b409 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 @@ -12,6 +12,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.AdapayMemberAccount; import com.jsowell.pile.domain.OrderSplitRecord; +import com.jsowell.pile.dto.QueryOrderSplitDTO; import com.jsowell.pile.dto.SplitOrderDTO; import com.jsowell.pile.mapper.OrderSplitRecordMapper; import com.jsowell.pile.service.AdapayMemberAccountService; @@ -251,6 +252,20 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { return null; } + /** + * 后管页面查询某站点下订单分账数据 + * @param dto + * @return + */ + @Override + public List queryOrderSplitData(QueryOrderSplitDTO dto) { + List orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(dto); + // 根据 orderCode 分组 + Map> collect = orderSplitRecordVOS.stream() + .collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode)); + return null; + } + @Override public List queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime) { return orderSplitRecordMapper.queryOrderSplitRecordByMemberId(adapayMemberId, startTime, endTime); 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 4a9e15930..d1d34b850 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,22 @@ public class OrderSplitRecordVO { */ private String orderCode; + /** + * 站点id + */ + private String stationId; + + /** + * 订单金额 + */ + private String orderAmount; + + /** + * 手续费 + * 不承担手续费的账户为0 + */ + private String feeAmount; + /** * 分账状态 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml index 87caf79e3..2ee8f3428 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml @@ -799,4 +799,25 @@ #{item} + +