提交瞩

api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java

@@ -10,19 +10,30 @@ public class AppBaseRequest {
     /***
      * token
      */
-    private Integer pageNum = 1 ;
+    private Integer pageNum = 1;
 
 
     /***
      * token
      */
-    private Integer pageSize = 10 ;
+    private Integer pageSize = 10;
 
     /***
      * token
      */
     private String token;
 
+    private String buyerName;
+
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
     public String getToken() {
         return token;
     }
@@ -34,7 +45,7 @@ public class AppBaseRequest {
     /***
      * 买家id，当前登录的买家id
      */
-    private Long buyerId ;
+    private Long buyerId;
 
     public Long getBuyerId() {
         return buyerId;

api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java

@@ -116,7 +116,7 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
         if (checkExpireTime && System.currentTimeMillis() < kuaidiQueryExpireTimeDB) {
             return JSONObject.parseObject(vvPackageEntity.getPackageLogisticsInfo(), KuaiDi100DTO.class);
         }
-        log.info("selectVvKuaidiAndUpdateData select packageLogisticsInfo trackNumber:{},role:{}", trackNumber ,role) ;
+        log.info("selectVvKuaidiAndUpdateData select packageLogisticsInfo trackNumber:{},role:{}", trackNumber, role);
         KuaiDi100DTO kuaiDi100DTO = null;
         // 如果是已经签收状态
         if (KuaiDi100StateEnums.sign_receipt.getState().equals(vvPackageEntity.getState())) {
@@ -169,7 +169,6 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
                                     message.getMessageProperties().setDelay((second) * 1000);   // 毫秒为单位，指定此消息的延时时长 ,+ 1 尽量保证机器人跑完了，再发送消息
                                     return message;
                                 });
-
                                 // 设置已经发送消息了
                                 vvPackageEntity.setIscheck("2");
                                 vvPackageEntity.setGmtSendMqDelivered(new Date());
@@ -181,12 +180,15 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
                                     tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus());
                                     tradeOrderLineEntity.setState(kuaiDi100DTO.getState());
                                     tradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
-
+                                    Long roleId = -1L;
+                                    if (RoleEnums.user.getRole().equals(role)) {
+                                        roleId = tradeOrderLineEntity.getBuyerId();
+                                    }
                                     vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                                             OrderStatusEnums.shipped,
-                                            RoleEnums.system.getRole(),
+                                            roleId,
+                                            role,
                                             OrderStatusEnums.shipped.getDesc()
-
                                     );
                                 }
                             } else {
@@ -195,7 +197,6 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
                                 vvReverseOrderEntity.setGmtShipped(new Date());
                                 vvReverseOrderEntity.setShippedUser(RoleEnums.system.getRole());
                                 List<VvReverseOrderLineEntity> vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvReverseOrderEntity.getId());
-
                                 List<Long> tradeOrderLineIdList = SanUtils.getFieldList(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId);
 
                                 if (CollectionUtils.isNotEmpty(tradeOrderLineIdList)) {
@@ -203,10 +204,14 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
                                     for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
                                         tradeOrderLineEntity.setReverseStatus(ReverseStatusEnums.shipped.getStatus());
                                         tradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
-
+                                        Long roleId = -1L;
+                                        if (RoleEnums.user.getRole().equals(role)) {
+                                            roleId = tradeOrderLineEntity.getBuyerId();
+                                        }
                                         vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                                                 ReverseStatusEnums.shipped,
-                                                RoleEnums.system.getRole(),
+                                                roleId,
+                                                role,
                                                 ReverseStatusEnums.shipped.getDesc()
                                         );
                                     }

api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java

@@ -84,15 +84,18 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
     }
 
     @Override
-    public int addOrderLineStatusLogList(List<Long> tradeOrderLineIdList, Object status, String changeStatusUser, String... reason) {
+    public int addOrderLineStatusLogList(List<Long> tradeOrderLineIdList,
+                                         Object status,
+                                         Long changeStatusUserId,String changeStatusUser, String... reason) {
         for (Long tradeOrderLineId : tradeOrderLineIdList) {
-            addOrderLineStatusLog(tradeOrderLineId, status, changeStatusUser, reason);
+            addOrderLineStatusLog(tradeOrderLineId, status,changeStatusUserId, changeStatusUser, reason);
         }
         return tradeOrderLineIdList.size();
     }
 
     @Override
-    public int addOrderLineStatusLog(Long tradeOrderLineId, Object status, String changeStatusUser, String ... reason) {
+    public int addOrderLineStatusLog(Long tradeOrderLineId, Object status
+            ,Long changeStatusUserId,String changeStatusUser, String ... reason) {
         VvTradeOrderLineStatusLogEntity entity = new VvTradeOrderLineStatusLogEntity();
         entity.setTradeOrderLineId(tradeOrderLineId);
         if (status instanceof OrderStatusEnums) {

api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java

@@ -13,12 +13,16 @@ public interface VvTradeOrderConvertService {
                                                     List<VvTradeOrderLineEntity> list, boolean isApp);
 
 
-    public int addOrderLineStatusLogList(List<Long> tradeOrderLineId, Object status, String changeStatusUser, String... reason);
+    public int addOrderLineStatusLogList(List<Long> tradeOrderLineId, Object status,
+                                         Long changeUserId ,
+                                         String changeStatusUser, String... reason);
 
 
     int addOrderLineStatusLog(Long tradeOrderLineId,
                               Object status,
+                              Long changeStatusUserId,
                               String changeStatusUser,
+
                               String... reason
 
     );

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java

@@ -250,12 +250,16 @@ public class AdminOrderController {
 
         vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity);
 
-        vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.admin.getRole(), false);
+        try {
+            vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.admin.getRole(), false);
 
-        VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber());
+            VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber());
 
-        //  创建订阅
+            //  创建订阅
-        KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), vvTradeOrderLineEntityList.get(0).getBuyerPhone());
+            KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), vvTradeOrderLineEntityList.get(0).getBuyerPhone());
+        } catch (Exception e) {
+            log.error("AdminOrderController subscribe KuaiDi100 Utils.subscribe error", e);
+        }
 
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             tradeOrderLineEntity.setTrackNumber(vvOrderRequest.getTrackNumber());
@@ -263,9 +267,12 @@ public class AdminOrderController {
             tradeOrderLineEntity.setGmtToShipping(new Date());
             tradeOrderLineEntity.setSellerId(vvOrderRequest.getSellerId());
 
+
             vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
-            vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+            vvTradeOrderConvertService.addOrderLineStatusLog(
+                    tradeOrderLineEntity.getId(),
                     OrderStatusEnums.shipping,
+                    vvOrderRequest.getAdminId(),
                     vvOrderRequest.getUserName());
         }
         return R.ok();
@@ -295,6 +302,7 @@ public class AdminOrderController {
 
             vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                     OrderStatusEnums.wait_shipping,
+                    vvOrderRequest.getAdminId(),
                     vvOrderRequest.getUserName(),
                     vvOrderRequest.getReason()
             );
@@ -324,6 +332,7 @@ public class AdminOrderController {
 
             vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                     OrderStatusEnums.shipped,
+                    vvDeliveredDTO.getAdminId(),
                     vvDeliveredDTO.getUserName()
             );
         }
@@ -375,6 +384,7 @@ public class AdminOrderController {
 
             vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                     OrderStatusEnums.delivered,
+                    vvDeliveredDTO.getAdminId(),
                     vvDeliveredDTO.getUserName()
             );
         }
@@ -422,6 +432,7 @@ public class AdminOrderController {
                 vvTradeOrderConvertService.addOrderLineStatusLog(
                         vvTradeOrderLineEntity.getId(),
                         OrderStatusEnums.cancel,
+                        vvCancelDTO.getAdminId(),
                         vvCancelDTO.getUserName(),
                         vvCancelDTO.getReason()
                 );

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java

@@ -196,6 +196,7 @@ public class AdminReverseController {
             vvTradeOrderConvertService.addOrderLineStatusLog(
                     vvTradeOrderLineEntity.getId(),
                     targetStatus,
+                    vvApproveRequest.getAdminId(),
                     vvApproveRequest.getUserName(),
                     vvApproveRequest.getReason(),
                     JSON.toJSONString(vvApproveRequest.getResources())

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java

@@ -251,7 +251,7 @@ public class AppOrderController {
                 VvShoppingCartEntity vvShoppingCart = vvShoppingCartDao.selectVvShoppingCartById(shoppingCartId);
                 String shippingActivityInfo = vvShoppingCart.getActivityInfo();
                 VvActivityDTO vvActivityDTOShipping = JSONObject.parseObject(shippingActivityInfo, VvActivityDTO.class);
-                vvActivityDTO = ActivityUtils.bestActivityDTO(vvActivityDTO,vvActivityDTOShipping);
+                vvActivityDTO = ActivityUtils.bestActivityDTO(vvActivityDTO, vvActivityDTOShipping);
             }
             Map<String, VvSkuPropertyValueEntity> vvSkuPropertyValueItemMap = SanUtils.groupByFiled2Map(vvSkuPropertyValueEntities, VvSkuPropertyValueEntity::getProductPropertyName);
             // 对商品属性进行排序
@@ -350,7 +350,7 @@ public class AppOrderController {
             }
             vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity);
         }
-        
+
 
         List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
 
@@ -441,7 +441,8 @@ public class AppOrderController {
                 vvTradeOrderConvertService.addOrderLineStatusLog(
                         vvTradeOrderLineEntity.getId(),
                         OrderStatusEnums.delete,
-                        vvOrderRequest.getBuyerId() + ""
+                        vvOrderRequest.getBuyerId(),
+                        vvOrderRequest.getBuyerName()
                 );
             }
         }
@@ -468,7 +469,8 @@ public class AppOrderController {
         for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
             vvTradeOrderConvertService.addOrderLineStatusLog(vvTradeOrderLineEntity.getId(),
                     ReverseStatusEnums.buyer_apply_cancel,
-                    request.getBuyerId() + ""
+                    request.getBuyerId(),
+                    request.getBuyerName()
                     , request.getReason()
             );
         }
@@ -494,7 +496,8 @@ public class AppOrderController {
 
             vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                     OrderStatusEnums.shipped,
-                    request.getBuyerId() + ""
+                    request.getBuyerId(),
+                    request.getBuyerName() + ""
             );
         }
         return R.ok();
@@ -527,7 +530,8 @@ public class AppOrderController {
             vvTradeOrderConvertService.addOrderLineStatusLog(
                     tradeOrderLineEntity.getId(),
                     OrderStatusEnums.delivered,
-                    vvDeliveredDTO.getBuyerId() + ""
+                    vvDeliveredDTO.getBuyerId(),
+                    vvDeliveredDTO.getBuyerName()
             );
         }
         return R.ok();
@@ -555,7 +559,8 @@ public class AppOrderController {
             vvTradeOrderConvertService.addOrderLineStatusLog(
                     tradeOrderLineEntity.getId(),
                     OrderStatusEnums.close,
-                    appCloseDTO.getBuyerId() + "",
+                    appCloseDTO.getBuyerId(),
+                    appCloseDTO.getBuyerName(),
                     appCloseDTO.getReason()
             );
         }

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java

@@ -146,7 +146,8 @@ public class AppReverseController {
             vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
             vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                     OrderStatusEnums.shipping,
-                    appliyReverseRequest.getBuyerId() + ""
+                    appliyReverseRequest.getBuyerId(),
+                    appliyReverseRequest.getBuyerName()
             );
         }
         return R.ok();
@@ -180,7 +181,8 @@ public class AppReverseController {
 
             vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
                     ReverseStatusEnums.close.getStatus(),
-                    request.getBuyerId() + ""
+                    request.getBuyerId() ,
+                    request.getBuyerName()
             );
         }
         return R.ok("逆向订单关闭成功");

api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java

@@ -58,6 +58,7 @@ public class DeliveredHandler extends BaseDelayedHandler {
 
             vvTradeOrderConvertService.addOrderLineStatusLog(vvTradeOrderLineEntity.getId(),
                     OrderStatusEnums.delivered,
+                    -1L,
                     RoleEnums.system.getRole()
             );