submit

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

@@ -1034,6 +1034,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             add.setStatus(1);
         }
         add.setOrgSign(1);
+        if (bo.getOrderFrom() != 6){
+            orderCostHandle(add,1);
+        }
         this.save(add);
 
 
@@ -2731,7 +2734,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         //七大员继教班级共享
                         classGrade.setSevenCode(getSevenCodeNoTenant(goodsId,classGrade));
                     }else {
-                        classGrade.setSevenCode(getSevenCode(goodsId));
+                        classGrade.setSevenCode(getSevenCode(goodsId,classGrade));
                     }
             }else {
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
@@ -2923,7 +2926,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         });
     }
 
-    private String getSevenCode(Long goodsId) {
+    private String getSevenCode(Long goodsId,ClassGrade classGradeVo) {
         Goods g = iGoodsService.getById(goodsId);
         List<Goods> list = iGoodsService.list(new LambdaQueryWrapper<Goods>()
                 .eq(Goods::getEducationTypeId, g.getEducationTypeId())
@@ -2941,6 +2944,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (CollectionUtils.isNotEmpty(classGradeList)){
                 ClassGrade classGrade = baseMapper.getSevenGrade(classGradeList.stream().map(ClassGradeGoods::getGradeId).collect(Collectors.toList()));
                 if (ObjectUtils.isNotNull(classGrade)){
+                    classGradeVo.setIsNewClass(false);
                     return classGrade.getSevenCode();
                 }
             }

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

@@ -5346,7 +5346,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         List<TopOldOrderGoods> orderGoodsList = topOrderGoodsService
                 .list(new LambdaQueryWrapper<TopOldOrderGoods>()
                         .eq(TopOldOrderGoods::getOrderSn, order.getOrderSn())
-                        .in(TopOldOrderGoods::getCheckStatus, Arrays.asList(0, 1))
+//                        .in(TopOldOrderGoods::getCheckStatus, Arrays.asList(0, 1))
                         .eq(TopOldOrderGoods::getStatus, 1));
         if (ObjectUtils.isNotNull(order.getPretaxBrokerage()) && order.getPretaxBrokerage().compareTo(BigDecimal.ZERO) != 0) {
             halveBrokerage = brokerage.divide(new BigDecimal(orderGoodsList.size()), 4, BigDecimal.ROUND_DOWN);