feat: 调整地址簿查询排序；调整京东下单逻辑；

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

@@ -61,6 +61,7 @@ public class BizAddressBookServiceImpl implements IBizAddressBookService
         bizAddressBook.setUserId(loginUser.getUserid());
         bizAddressBook.setDeptId(loginUser.getSysUser().getDeptId());
         bizAddressBook.setCreateTime(DateUtils.getNowDate());
+        bizAddressBook.setCreateBy(loginUser.getUsername());
 
         if ("1".equals(bizAddressBook.getDefaultFlag())) {
             bizAddressBookMapper.updateBizAddressBookDefault(loginUser.getUserid());
@@ -78,6 +79,8 @@ public class BizAddressBookServiceImpl implements IBizAddressBookService
     @Override
     public int updateBizAddressBook(BizAddressBook bizAddressBook)
     {
+        bizAddressBook.setCreateTime(DateUtils.getNowDate());
+        bizAddressBook.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
         bizAddressBook.setUpdateTime(DateUtils.getNowDate());
         return bizAddressBookMapper.updateBizAddressBook(bizAddressBook);
     }

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

@@ -85,17 +85,16 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
         if(!orderObject.getBooleanValue("success")){
             throw new ServiceException("下单失败！ 原因:"+orderObject.getString("msg"));
         }
-        if("1".equals(bizWaybillOrder.getOrderType())){
-            bizWaybillOrder.setExternalWaybillNo(orderObject.getString("data"));
-        }
-        //顺丰物流返回的运单号
-        JSONArray waybillNoArray=orderObject.getJSONArray("data");
-        for (int i = 0; i < waybillNoArray.size(); i++) {
-            JSONObject waybillNoJSONObject = waybillNoArray.getJSONObject(i);
-            int waybillType = waybillNoJSONObject.getIntValue("waybillType");
-            String  waybillNo = waybillNoJSONObject.getString("waybillNo");
-            if(waybillType==1){
-                bizWaybillOrder.setExternalWaybillNo(waybillNo) ;
+        if("2".equals(bizWaybillOrder.getOrderType())){
+            //顺丰物流返回的运单号
+            JSONArray waybillNoArray=orderObject.getJSONArray("data");
+            for (int i = 0; i < waybillNoArray.size(); i++) {
+                JSONObject waybillNoJSONObject = waybillNoArray.getJSONObject(i);
+                int waybillType = waybillNoJSONObject.getIntValue("waybillType");
+                String  waybillNo = waybillNoJSONObject.getString("waybillNo");
+                if(waybillType==1){
+                    bizWaybillOrder.setExternalWaybillNo(waybillNo) ;
+                }
             }
         }
         bizWaybillOrder.setCreateTime(DateUtils.getNowDate());

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

@@ -63,13 +63,15 @@ public class JDLogisticsService  implements LogisticsService {
             Contact senderContact  = new Contact();
             senderContact.setName(bizWaybillOrder.getSenderName());
             senderContact.setMobile(bizWaybillOrder.getSenderPhone());
-            senderContact.setFullAddress(bizWaybillOrder.getSenderProvince() + bizWaybillOrder.getSenderCity() + bizWaybillOrder.getSenderCounty() + bizWaybillOrder.getSenderAddress());
+//            senderContact.setFullAddress(bizWaybillOrder.getSenderProvince() + bizWaybillOrder.getSenderCity() + bizWaybillOrder.getSenderCounty() + bizWaybillOrder.getSenderAddress());
+            senderContact.setFullAddress("北京市大兴区亦庄经济开发区abc");
 
             //收货人
             Contact receiverContact = new Contact();
             receiverContact.setName(bizWaybillOrder.getReceiverName());
             receiverContact.setMobile(bizWaybillOrder.getReceiverPhone());
-            receiverContact.setFullAddress(bizWaybillOrder.getReceiverProvince() + bizWaybillOrder.getReceiverCity() + bizWaybillOrder.getReceiverCounty() + bizWaybillOrder.getReceiverAddress());
+//            receiverContact.setFullAddress(bizWaybillOrder.getReceiverProvince() + bizWaybillOrder.getReceiverCity() + bizWaybillOrder.getReceiverCounty() + bizWaybillOrder.getReceiverAddress());
+            receiverContact.setFullAddress("河南省洛阳市西工区正大国际西区");
 
             //订单信息
             CommonCreateOrderRequest requestDTO = new  CommonCreateOrderRequest();
@@ -130,11 +132,17 @@ public class JDLogisticsService  implements LogisticsService {
 
             //发货人
             com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.Contact senderContact  = new com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.Contact();
-            senderContact.setFullAddress(bizWaybillOrder.getSenderProvince() + bizWaybillOrder.getSenderCity() + bizWaybillOrder.getSenderCounty() + bizWaybillOrder.getSenderAddress());
+            senderContact.setName(bizWaybillOrder.getSenderName());
+            senderContact.setMobile(bizWaybillOrder.getSenderPhone());
+//            senderContact.setFullAddress(bizWaybillOrder.getSenderProvince() + bizWaybillOrder.getSenderCity() + bizWaybillOrder.getSenderCounty() + bizWaybillOrder.getSenderAddress());
+            senderContact.setFullAddress("北京市大兴区亦庄经济开发区abc");
 
             //收货人
             com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.Contact receiverContact = new com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.Contact();
-            receiverContact.setFullAddress(bizWaybillOrder.getReceiverProvince() + bizWaybillOrder.getReceiverCity() + bizWaybillOrder.getReceiverCounty() + bizWaybillOrder.getReceiverAddress());
+            receiverContact.setName(bizWaybillOrder.getReceiverName());
+            receiverContact.setMobile(bizWaybillOrder.getReceiverPhone());
+//            receiverContact.setFullAddress(bizWaybillOrder.getReceiverProvince() + bizWaybillOrder.getReceiverCity() + bizWaybillOrder.getReceiverCounty() + bizWaybillOrder.getReceiverAddress());
+            receiverContact.setFullAddress("河南省洛阳市西工区正大国际西区");
 
             //订单信息
             com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.CommonCreateOrderRequest requestDTO = new  com.lop.open.api.sdk.domain.ECAP.CommonCreateOrderApi.commonCreateOrderV1.CommonCreateOrderRequest();
@@ -182,6 +190,7 @@ public class JDLogisticsService  implements LogisticsService {
                 if (response.getResult().getCode() == 0) {
                     result.put("success", true);
                     // 返回京东物流单号
+                    bizWaybillOrder.setExternalWaybillNo(response.getResult().getData().getWaybillCode());
                     result.put("data", response.getResult().getData().getWaybillCode());
                     result.put("msg", "");
                 } else {
@@ -213,8 +222,8 @@ public class JDLogisticsService  implements LogisticsService {
 
             //取消订单入参对象
             CommonOrderCancelRequest requestDTO = new CommonOrderCancelRequest();
-            requestDTO.setWaybillCode(bizWaybillOrder.getExternalWaybillNo());
-            requestDTO.setCustomerOrderId(bizWaybillOrder.getWaybillNo());
+            requestDTO.setWaybillCode(bizWaybillOrder.getExternalWaybillNo());//JDV025588771574
+            requestDTO.setCustomerOrderId(bizWaybillOrder.getWaybillNo());//RJSD20260206000027
             requestDTO.setOrderOrigin(getOrderOrigin(bizWaybillOrder.getProductCode()));
             requestDTO.setCustomerCode(requestDTO.getOrderOrigin() == 1 ?
                     sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE) :

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizAddressBookMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
         </where>
-        order by default_flag desc
+        order by default_flag desc, create_time desc
     </select>
     
     <select id="selectBizAddressBookByAddressId" parameterType="Long" resultMap="BizAddressBookResult">