submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -216,6 +216,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     private IUserSubscribeService iUserSubscribeService;
     @Autowired
     private ITopOldOrderService topOldOrderService;
+    @Autowired
+    private ISysOldOrgService iSysOldOrgService;
 
     @Override
     public OrderVo queryById(Long orderId) {
@@ -476,6 +478,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setUpdateTime(DateUtils.getNowTime());
         add.setOrderType(Order.CONSUME_ORDER);
         add.setCreateUsername(bo.getCreateBy());//
+        //订单运营类型
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        if (ObjectUtils.isNotNull(oldOrg)){
+            add.setOperationType(oldOrg.getOperationType());
+        }
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
 
@@ -625,6 +633,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         add.setOrderType(Order.CONSUME_ORDER);
+        //订单运营类型
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        if (ObjectUtils.isNotNull(oldOrg)){
+            add.setOperationType(oldOrg.getOperationType());
+        }
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
 
@@ -960,7 +974,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-
+        //订单运营类型
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        if (ObjectUtils.isNotNull(oldOrg)){
+            add.setOperationType(oldOrg.getOperationType());
+        }
 
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
@@ -1358,7 +1377,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-
+        //订单运营类型
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        if (ObjectUtils.isNotNull(oldOrg)){
+            add.setOperationType(oldOrg.getOperationType());
+        }
 
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
@@ -1549,7 +1573,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-
+        //订单运营类型
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        if (ObjectUtils.isNotNull(oldOrg)){
+            add.setOperationType(oldOrg.getOperationType());
+        }
 
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1224,9 +1224,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             //成本设置项
             TopOldOrder order = getById(oldOrder.getOrderId());
 
-            List<String> tenantIds = Arrays.asList("1", "867735392558919680");
-            if (tenantIds.contains(order.getTenantId())) {
-                //祥粤云订单不算分成
+//            List<String> tenantIds = Arrays.asList("867735392558919680");
+//            tenantIds.contains(order.getTenantId());
+            if (order.getOrderFrom() == 1) {
+                //新系统C端订单不算分成
                 order.setFinishStatus(1);//已完单
                 //修改订单分成
                 updateById(order);
@@ -1253,6 +1254,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     //修改订单分成
                     updateById(order);
                 }
+                //佣金
+                createBrokerageCheck(order);
             }
         }
 
@@ -2654,6 +2657,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                 order.setAccomplishTime(DateUtils.getNowTime());
                                 //修改订单分成
                                 updateById(order);
+
+                                //佣金
+                                createBrokerageCheck(order);
                                 return;
                             }
                             //分成金额
@@ -2665,11 +2671,16 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                 order.setAccomplishTime(DateUtils.getNowTime());
                                 //修改订单分成
                                 updateById(order);
+
+                                //佣金
+                                createBrokerageCheck(order);
                                 return;
                             }
                             //分成模板
                             List<TopCostTpItemVo> divideList = itemList.stream().filter(x -> x.getItemCategory() == 1).collect(Collectors.toList());
                             calculateDivide(divideList, order, divideModel);
+                            //佣金
+                            createBrokerageCheck(order);
                     }
                 }
         );
@@ -2700,7 +2711,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             order.setDivideModel(divideModel);
             order.setAccomplishTime(DateUtils.getNowTime());
             //修改订单分成
-            updateById(order);
+            updateById(order)
             return;
         }
         //佣金
@@ -2854,7 +2865,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 log.setCheckSign(i > 0 ? 0 : 1);
                 log.setCheckSort(check.getCheckSort());
                 log.setType(check.getCheckType());
-                log.setTenantId(order.getTenantId());
                 if (check.getCheckType() == 6) {
                     //分成支付
                     log.setCheckStatus(2);//待支付
@@ -2873,6 +2883,47 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
     }
 
+    private void createBrokerageCheck(TopOldOrder order){
+        if (ObjectUtils.isNull(order.getPretaxBrokerage()) || order.getBrokerage().compareTo(BigDecimal.ZERO) <= 0){
+            return;
+        }
+        List<TopOldOrderCheckLog> list = topOldOrderCheckLogService.list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
+                .eq(TopOldOrderCheckLog::getOrderSn, order.getOrderSn())
+                .eq(TopOldOrderCheckLog::getCheckFrom, 4)
+                .in(TopOldOrderCheckLog::getType, Arrays.asList(5, 6)));
+        if (CollectionUtils.isNotEmpty(list)){
+            //已有佣金审核
+            return;
+        }
+        //创建订单佣金审核流程
+        List<TopOldOrderCheck> checkList = topOldOrderCheckService
+                .list(new LambdaQueryWrapper<TopOldOrderCheck>().in(TopOldOrderCheck::getCheckType, Arrays.asList(5, 6))
+                        .orderByAsc(TopOldOrderCheck::getCheckSort));
+        if (CollectionUtils.isNotEmpty(checkList) ) {
+            List<TopOldOrderCheckLog> logs = new ArrayList<>();
+            for (int i = 0; i < checkList.size(); i++) {
+                TopOldOrderCheck check = checkList.get(i);
+                TopOldOrderCheckLog log = new TopOldOrderCheckLog();
+                log.setOrderSn(order.getOrderSn());
+                log.setRoleId(check.getCheckRole());
+                log.setUpdateTime(DateUtils.getNowTime());
+                log.setCreateTime(DateUtils.getNowTime());
+                log.setTenantId(order.getTenantId());
+                log.setCheckSign(i > 0 ? 0 : 1);
+                log.setCheckSort(check.getCheckSort());
+                log.setType(check.getCheckType());
+                log.setCheckFrom(4);
+                if (check.getCheckType() == 6) {
+                    log.setCheckStatus(2);//待支付
+                } else {
+                    log.setCheckStatus(0);//待审核
+                }
+                logs.add(log);
+            }
+            topOldOrderCheckLogService.saveBatch(logs);
+        }
+    }
+
     //完单校验
     private void validFinish(TopFinishOrderBo bo) {
         if ("admin".equals(bo.getLoginName())) {
@@ -3656,7 +3707,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     //修改订单分成
                     updateById(order);
                 }
-
+                //佣金
+                createBrokerageCheck(order);
                 //完单通知旧系统
                 Map<String, String> params = new HashMap<>();
                 Long nowTime = DateUtils.getNowTime();

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/service/impl/ITopInstSettleServiceImpl.java

@@ -461,7 +461,7 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
             checkLog.setRoleId(orderCheck.getCheckRole());
             checkLog.setType(orderCheck.getCheckType());
             checkLog.setCheckSort(orderCheck.getCheckSort());
-            checkLog.setCheckFrom(4);//供应商结算
+            checkLog.setCheckFrom(5);//供应商结算
             checkLog.setOrderSn(settleSn);
             checkLog.setCreateTime(DateUtils.getNowTime());
             checkLog.setUpdateTime(DateUtils.getNowTime());
@@ -562,7 +562,7 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
                         .getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                                 .eq(TopOldOrderCheckLog::getOrderSn, item.getSettleSn())
                                 .eq(TopOldOrderCheckLog::getCheckSign, 1)
-                                .eq(TopOldOrderCheckLog::getCheckFrom, 4)
+                                .eq(TopOldOrderCheckLog::getCheckFrom, 5)
                                 .eq(TopOldOrderCheckLog::getStatus, 1));
                 if (ObjectUtils.isNotNull(checkLog)){
                     TopSysRole role = topSysRoleService.getById(checkLog.getRoleId());
@@ -574,7 +574,7 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
                                 .getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                                         .eq(TopOldOrderCheckLog::getOrderSn, item.getSettleSn())
                                         .eq(TopOldOrderCheckLog::getCheckSort, checkLog.getCheckSort() -1)
-                                        .eq(TopOldOrderCheckLog::getCheckFrom, 4)
+                                        .eq(TopOldOrderCheckLog::getCheckFrom, 5)
                                         .eq(TopOldOrderCheckLog::getStatus, 1));
                         if (ObjectUtil.isNotNull(checkLogTwo)){
                             item.setCheckTime(checkLogTwo.getCheckTime());
@@ -812,7 +812,7 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
                 .eq(TopOldOrderCheckLog::getOrderSn, settle.getSettleSn())
                 .eq(TopOldOrderCheckLog::getCheckSign, 1)
                 .eq(TopOldOrderCheckLog::getStatus, 1)
-                .eq(TopOldOrderCheckLog::getCheckFrom, 4));
+                .eq(TopOldOrderCheckLog::getCheckFrom, 5));
         if (ObjectUtils.isEmpty(checkLog)){
             throw new CustomException("结算单审核节点有误，请联系管理员！");
         }
@@ -1109,7 +1109,7 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
                         .eq(TopOldOrderCheckLog::getOrderSn, settleSn)
                         .eq(TopOldOrderCheckLog::getCheckSort, sort)
                         .eq(TopOldOrderCheckLog::getStatus, 1)
-                        .eq(TopOldOrderCheckLog::getCheckFrom, 4));
+                        .eq(TopOldOrderCheckLog::getCheckFrom, 5));
         if (CollectionUtils.isEmpty(settleRoleList)){
             return checkLog;
         }