Merge branch 'dev'

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

@@ -649,11 +649,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             add.setOperationType(oldOrg.getOperationType());
         }
         //是否总平台已存在
-        TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
-                .eq(TopOldOrder::getInputOrderSn, bo.getInputOrderSn()));
-        if (ObjectUtils.isNotNull(oldOrder)){
-            add.setOrgSign(1);
+        if (ObjectUtils.isNotNull(orderInput) && ObjectUtils.isNotNull(orderInput.getOldOrderSn())){
+            TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
+                    .eq(TopOldOrder::getOrderSn, orderInput.getOldOrderSn()));
+            if (ObjectUtils.isNotNull(oldOrder)){
+                add.setOrgSign(1);
+            }
         }
+
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
 
@@ -2868,7 +2871,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             ClassGradeUser gradeUser = classGradeUser.stream().findFirst().orElse(null);
             OrderGoods orderGoodsTwo = iOrderGoodsService.getById(gradeUser.getOrderGoodsId());
             Goods goods = iGoodsService.getById(orderGoodsTwo.getGoodsId());
-            throw new CustomException(String.format("请先学完【%s】课程！",goods.getGoodsName()));
+            throw new CustomException(String.format("请先学习完成并审核完成【%s】课程！",goods.getGoodsName()));
         }
 
         return true;

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

@@ -554,6 +554,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             add.setFinishStatus(1);//C端自动完单
         }
 
+        if (bo.getOrderFrom() == 2 && bo.getOrderBase() == 2){
+            add.setPurchaseOrg("旧云学堂C端");
+            add.setOldCustomerId(999L);
+            add.setOldCompanyId(999L);
+            add.setOldInstitutionId(999L);
+        }
         //未收账款
         if (ObjectUtils.isNull(bo.getOrderReceived()) || bo.getOrderReceived().compareTo(new BigDecimal("0.00")) == 0) {
             add.setOrderUncollected(bo.getPayPrice());
@@ -2735,9 +2741,14 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
 
             //占比
-            BigDecimal divide = item.getMoney().divide(moneyTotal, 2, RoundingMode.HALF_UP);
-            String s = divide.multiply(new BigDecimal("100")).toString();
-            item.setOccupationRate(s+"%");
+            if(moneyTotal.compareTo(BigDecimal.ZERO)>0){
+                BigDecimal divide = item.getMoney().divide(moneyTotal, 2, RoundingMode.HALF_UP);
+                String s = divide.multiply(new BigDecimal("100")).toString();
+                item.setOccupationRate(s+"%");
+            }else {
+                item.setOccupationRate("0%");
+            }
+
         });
         return moneyVos;
     }
@@ -2819,9 +2830,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
 
             //占比
-            BigDecimal divide = new BigDecimal(item.getOrderNum()).divide(new BigDecimal(numTotal), 2, RoundingMode.HALF_UP);
-            String s = divide.multiply(new BigDecimal("100")).toString();
-            item.setOccupationRate(s+"%");
+            if(numTotal>0){
+                BigDecimal divide = new BigDecimal(item.getOrderNum()).divide(new BigDecimal(numTotal), 2, RoundingMode.HALF_UP);
+                String s = divide.multiply(new BigDecimal("100")).toString();
+                item.setOccupationRate(s+"%");
+            }else {
+                item.setOccupationRate("0%");
+            }
         });
         return numVos;
     }