feat: 京东物流回调入参调整；

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/callback/JDPushOrderFeeCallback.java

@@ -1,6 +1,6 @@
 package com.ruoyi.logistics.callback;
 
-import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.logistics.domain.BizFinancialFeeItems;
 import com.ruoyi.logistics.domain.BizWaybillCostDetails;
@@ -13,7 +13,6 @@ import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.service.ISysDeptService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,11 +38,9 @@ public class JDPushOrderFeeCallback {
     @Autowired
     private FeeItemsCacheService feeItemsCacheService;
 
-    @RequestMapping(value = "/fee", consumes = MediaType.TEXT_PLAIN_VALUE)
-    public AjaxResult fee(@RequestBody String requestBody) {
-        log.info("京东物流运单费用回调，参数：{}", requestBody);
-
-        JDOrderFeeRequestDTO request = JSON.parseObject(requestBody, JDOrderFeeRequestDTO.class);
+    @RequestMapping("/fee")
+    public AjaxResult fee(@RequestBody JDOrderFeeRequestDTO request) {
+        log.info("京东物流运单费用回调，参数：{}", request);
 
         // 根据运单号查询订单
         BizWaybillOrder query = new BizWaybillOrder();
@@ -67,7 +64,7 @@ public class JDPushOrderFeeCallback {
                 costDetail.setFeeItemName(feeItemByExtFeeCode.getFeeItemName());
                 costDetail.setFeeName(item.getFeeTypeName());
                 costDetail.setAmount(item.getStandardAmount());
-                costDetail.setRateAmount(item.getStandardAmount().multiply(new BigDecimal(sysDept.getRateValue())).setScale(2, BigDecimal.ROUND_HALF_UP));
+                costDetail.setRateAmount(item.getStandardAmount().multiply(new BigDecimal(StringUtils.isNotBlank(sysDept.getRateValue()) ? sysDept.getRateValue() : "1")).setScale(2, BigDecimal.ROUND_HALF_UP));
                 costDetail.setDeptId(bizWaybillOrder.getDeptId());
                 costDetail.setUserId(bizWaybillOrder.getUserId());
             }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/callback/JDPushOrderStatausCallback.java

@@ -40,7 +40,7 @@ public class JDPushOrderStatausCallback {
         Boolean update = Boolean.FALSE;
         switch (request.getOperationCode()) {
             case "200001"://揽收
-                bizWaybillOrder.setOrderStatus(OrderStatusEnum.ORDER_STATUS_1.getCode());
+                bizWaybillOrder.setOrderStatus(OrderStatusEnum.ORDER_STATUS_2.getCode());
                 bizWaybillOrder.setPickupTime(DateUtils.getNowDate());
                 update = Boolean.TRUE;
                 break;