submit

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

@@ -969,9 +969,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (order.getOrderFrom() == 1) {
             throw new CustomException("订单号无效：" + bo.getOrderSn());
         }
-        if (order.getFinishStatus() == 1) {
-            throw new CustomException("订单已完单不能修改：" + bo.getOrderSn());
-        }
+//        if (order.getFinishStatus() == 1) {
+//            throw new CustomException("订单已完单不能修改：" + bo.getOrderSn());
+//        }
         //佣金计算
         if (ObjectUtils.isNotNull(bo.getPretaxBrokerage()) && ObjectUtils.isNotNull(bo.getPretax())) {
             BigDecimal multiply = bo.getPretaxBrokerage().multiply(bo.getPretax());
@@ -3518,6 +3518,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             topOrderStatisticsBo.setStartTime(startTime - time);
             topOrderStatisticsBo.setEndTime(startTime);
             topOrderStatisticsBo.setCreateNo(item.getCreateNo());
+            topOrderStatisticsBo.setCustomerId(bo.getCustomerId());
             topOrderStatisticsBo.setBusinessName(item.getBusinessName());
             topOrderStatisticsBo.setTenantId(bo.getTenantId());
             List<TopOrderStatisticsMoneyVo> moneyList1 = baseMapper.getBusinessOrderMoney(topOrderStatisticsBo);