feat: 新增月度汇总定时任务；增加京东事业部编码字段；

jd-logistics-modules/jd-logistics-job/src/main/java/com/ruoyi/job/task/FinancialMonthSummaryTask.java

@@ -0,0 +1,20 @@
+package com.ruoyi.job.task;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 月度汇总定时任务
+ *
+ * @author lydgt
+ */
+@Component("financialMonthSummaryTask")
+public class FinancialMonthSummaryTask {
+
+    public void doTask() {
+        System.out.println("月度汇总定时任务");
+    }
+
+    public void doTask(Integer deptName, String month) {
+        System.out.println("月度汇总定时任务，部门ID：" + deptName + ", 月份：" + month);
+    }
+}

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/constant/SysConfigConstants.java

@@ -6,4 +6,8 @@ public class SysConfigConstants {
      * 京东客户编码
      */
     public static final String JD_LOGISTICS_CUSTOMERCODE = "jd.logistics.customercode";
+    /**
+     * 京东事业部编码
+     */
+    public static final String JD_LOGISTICS_BUSINESSUNITCODE = "jd.logistics.businessunitcode";
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/JDLogisticsService.java

@@ -74,7 +74,9 @@ public class JDLogisticsService  implements LogisticsService {
             //订单信息
             CommonCreateOrderRequest requestDTO = new  CommonCreateOrderRequest();
             requestDTO.setOrderOrigin(getOrderOrigin(bizWaybillOrder.getProductCode()));
-            requestDTO.setCustomerCode(sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE));
+            requestDTO.setCustomerCode(requestDTO.getOrderOrigin() == 1 ?
+                    sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE) :
+                    sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_BUSINESSUNITCODE));
             requestDTO.setPickupStartTime(bizWaybillOrder.getSendStartTime().getTime());
             requestDTO.setPickupEndTime(bizWaybillOrder.getSendEndTime().getTime());
 
@@ -138,7 +140,9 @@ public class JDLogisticsService  implements LogisticsService {
             com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.CommonCreateOrderRequest requestDTO = new  com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.CommonCreateOrderRequest();
             requestDTO.setOrderId(bizWaybillOrder.getWaybillNo());
             requestDTO.setOrderOrigin(getOrderOrigin(bizWaybillOrder.getProductCode()));
-            requestDTO.setCustomerCode(sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE));
+            requestDTO.setCustomerCode(requestDTO.getOrderOrigin() == 1 ?
+                    sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE) :
+                    sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_BUSINESSUNITCODE));
             requestDTO.setSettleType(3);
             requestDTO.setPickupStartTime(bizWaybillOrder.getSendStartTime().getTime());
             requestDTO.setPickupEndTime(bizWaybillOrder.getSendEndTime().getTime());
@@ -208,16 +212,18 @@ public class JDLogisticsService  implements LogisticsService {
             EcapV1OrdersCancelLopRequest request = new EcapV1OrdersCancelLopRequest();
 
             //取消订单入参对象
-            CommonOrderCancelRequest commonOrderCancelRequest = new CommonOrderCancelRequest();
-            commonOrderCancelRequest.setWaybillCode(bizWaybillOrder.getExternalWaybillNo());
-            commonOrderCancelRequest.setCustomerOrderId(bizWaybillOrder.getWaybillNo());
-            commonOrderCancelRequest.setOrderOrigin(1);
-            commonOrderCancelRequest.setCustomerCode(sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE));
-            commonOrderCancelRequest.setCancelReason("取消原因");
-            commonOrderCancelRequest.setCancelReasonCode("1");
-            commonOrderCancelRequest.setCancelType(1);
-
-            request.setRequest(commonOrderCancelRequest);
+            CommonOrderCancelRequest requestDTO = new CommonOrderCancelRequest();
+            requestDTO.setWaybillCode(bizWaybillOrder.getExternalWaybillNo());
+            requestDTO.setCustomerOrderId(bizWaybillOrder.getWaybillNo());
+            requestDTO.setOrderOrigin(getOrderOrigin(bizWaybillOrder.getProductCode()));
+            requestDTO.setCustomerCode(requestDTO.getOrderOrigin() == 1 ?
+                    sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE) :
+                    sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_BUSINESSUNITCODE));
+            requestDTO.setCancelReason(bizWaybillOrder.getCancelReason());
+            requestDTO.setCancelReasonCode("1");
+            requestDTO.setCancelType(1);
+
+            request.setRequest(requestDTO);
 
             //设置插件，必须的操作，不同类型的应用入参不同，请看入参注释，公共参数按顺序分别为AppKey、AppSecret、AccessToken
             //使用开放平台ISV/自研商家应用调用接口