Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java

@@ -132,6 +132,12 @@ public class OrderBasicInfoController extends BaseController {
 			orderBasicInfo.setMerchantId(String.valueOf(pileMerchantInfo.getId()));
 		}
 		List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoListWithAuth(orderBasicInfo);
+		// 将结算金额改为实收金额
+		if (CollectionUtils.isNotEmpty(list)) {
+			for (OrderListVO orderListVO : list) {
+				orderListVO.setSettleAmount(String.valueOf(orderListVO.getActualReceivedAmount()));
+			}
+		}
 		ExcelUtil<OrderListVO> util = new ExcelUtil<OrderListVO>(OrderListVO.class);
 		util.exportExcel(response, list, "订单数据");
 	}

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderTotalDataVO.java

@@ -21,6 +21,9 @@ public class OrderTotalDataVO {
 	// 总用电量
 	private BigDecimal sumUsedElectricity;
 
+	// 总实收金额
+	private BigDecimal sumActualReceivedAmount;
+
 	// 总结算金额
 	private BigDecimal sumSettleAmount;
 }

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -1952,6 +1952,7 @@
         select
         IFNULL(sum(t1.order_amount),0) as sumOrderAmount,
         IFNULL(sum(t4.total_used_electricity),0) as sumUsedElectricity,
+        IFNULL(sum(t1.actual_received_amount), 0) as sumActualReceivedAmount,
         IFNULL(sum(t1.settle_amount),0) as sumSettleAmount
         from order_basic_info t1
         left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java

@@ -59,6 +59,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
+import static com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils.isNeedPushToThirdPartyPlatform;
+
 @Service
 @Slf4j
 public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
@@ -469,6 +471,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationStartChargeResult(String orderCode) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         // 根据订单号查询订单信息
         OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         if (orderInfo == null) {
@@ -582,6 +591,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationEquipChargeStatus(String orderCode) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         // 根据订单号查询订单信息
         OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderInfo.getOrderCode());
@@ -684,6 +700,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationStopChargeResult(String orderCode) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         // 根据订单号查询订单信息
         OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         if (orderInfo == null) {
@@ -752,6 +775,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationChargeOrderInfo(String orderCode, ThirdPartySecretInfoVO thirdPartySecretInfoVO) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
 
@@ -808,6 +838,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationPayOrderInfo(String orderCode){
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         //获取订单信息
         OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         if (orderBasicInfo == null) {

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/ThirdPartyPlatformUtils.java

@@ -116,4 +116,17 @@ public class ThirdPartyPlatformUtils {
         }
     }
 
+    /**
+     * 通过截取订单号前9位,来判断是否需要推送充电记录到指定的第三方平台
+     * 例: 2025-08-05 ,常畅充平台只需要通过他们平台启动的充电记录
+     *
+     *
+     * @param orderCode
+     * @return
+     */
+    public static Boolean isNeedPushToThirdPartyPlatform(String orderCode,String operatorId) {
+        String operatorIdPrefix = StringUtils.substring(orderCode , 0 , 9);
+        return operatorIdPrefix.equals(operatorId);
+    }
+
 }