submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -321,9 +321,9 @@ public class CommonController extends BaseController {
     @ApiOperation("获取订单商品信息")
     @PostMapping("/order/goods/list")
     public AjaxResult<TopOrderOrgVo> getOrderGoodsList(@RequestBody TopOldOrderQueryBo bo) {
-//        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-//            throw new CustomException("签名错误");
-//        }
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
         return AjaxResult.success(iTopOldOrderService.getTopOrderGoodsList(bo));
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderAcceptanceController.java

@@ -122,11 +122,11 @@ public class TopOrderAcceptanceController extends BaseController {
 
     @ApiOperation("认款记录导入")
     @PostMapping("/importData")
-    public AjaxResult<Void> importData(MultipartFile file) {
+    public AjaxResult<Void> importData(MultipartFile files) {
         ExcelUtil<TopOrderAcceptanceExportBo> util = new ExcelUtil<TopOrderAcceptanceExportBo>(TopOrderAcceptanceExportBo.class);
         List<TopOrderAcceptanceExportBo> acceptanceExportBos;
         try {
-            acceptanceExportBos = util.importExcel(file.getInputStream());
+            acceptanceExportBos = util.importExcel(files.getInputStream());
         }catch (Exception e){
             e.printStackTrace();
             throw new IllegalArgumentException("模板格式不正确,请重新下载模板");

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

@@ -2912,7 +2912,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }else {
                 item.setTenantId(item.getCustomerId());
             }
-            if (item.getMoney().compareTo(BigDecimal.ZERO) == 0){
+            if (item.getMoney().compareTo(BigDecimal.ZERO) == 0 && (ObjectUtils.isNull(item.getOrderNum()) || item.getOrderNum() == 0)){
                 return;
             }
             //订单金额
@@ -2971,13 +2971,19 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
 
             //金额占比
-            BigDecimal divide = item.getMoney().divide(totalVo.getMoneyTotal(), 2, RoundingMode.HALF_UP);
-            String s = divide.multiply(new BigDecimal("100")).toString();
-            item.setMoneyOccupationRate(s+"%");
+            if (ObjectUtils.isNotNull(totalVo.getMoneyTotal()) && totalVo.getMoneyTotal().compareTo(BigDecimal.ZERO )> 0){
+                BigDecimal divide = item.getMoney().divide(totalVo.getMoneyTotal(), 2, RoundingMode.HALF_UP);
+                String s = divide.multiply(new BigDecimal("100")).toString();
+                item.setMoneyOccupationRate(s+"%");
+            }else {
+                item.setMoneyOccupationRate("0%");
+            }
             //数量占比
-            BigDecimal divide2 = new BigDecimal(item.getOrderNum()).divide(new BigDecimal(totalVo.getOrderNumTotal()), 2, RoundingMode.HALF_UP);
-            String s2 = divide2.multiply(new BigDecimal("100")).toString();
-            item.setOccupationRate(s2+"%");
+            if (ObjectUtils.isNotNull(totalVo.getOrderNumTotal()) && totalVo.getOrderNumTotal() > 0){
+                BigDecimal divide2 = new BigDecimal(item.getOrderNum()).divide(new BigDecimal(totalVo.getOrderNumTotal()), 2, RoundingMode.HALF_UP);
+                String s2 = divide2.multiply(new BigDecimal("100")).toString();
+                item.setOccupationRate(s2+"%");
+            }
         });
         return detailVos;
     }

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

@@ -104,7 +104,10 @@ public class TopOrderAcceptanceServiceImpl extends ServiceImpl<TopOrderAcceptanc
         }
         List<TopOrderAcceptance> collect = acceptanceExportBos.stream().map(item -> {
             TopOrderAcceptance bo = BeanUtil.toBean(item, TopOrderAcceptance.class);
-            bo.setIncomeMoney(new BigDecimal(item.getIncomeMoney()));
+            BigDecimal bigDecimal = new BigDecimal(item.getIncomeMoney());
+            bo.setIncomeMoney(bigDecimal);
+            //待认款金额
+            bo.setUnacceptanceMoney(bigDecimal);
             bo.setIncomeTime(DateUtils.dateTimeSec("yyyy/MM/dd",item.getIncomeTime()));
             bo.setAcceptanceType(1);
             bo.setIncomeType(1);
@@ -116,7 +119,7 @@ public class TopOrderAcceptanceServiceImpl extends ServiceImpl<TopOrderAcceptanc
             return bo;
         }).collect(Collectors.toList());
 
-        return updateBatchById(collect);
+        return saveBatch(collect);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderStatisticsDetailVo.java

@@ -29,22 +29,22 @@ public class TopOrderStatisticsDetailVo implements Serializable {
     private Integer orderType;
 
     @ApiModelProperty("环比")
-    private BigDecimal weekRate;
+    private BigDecimal weekRate = BigDecimal.ZERO;
 
     @ApiModelProperty("同比")
-    private BigDecimal yearRate;
+    private BigDecimal yearRate = BigDecimal.ZERO;
 
     @ApiModelProperty("占比")
     private String occupationRate;
 
     @ApiModelProperty("金额")
-    private BigDecimal money;
+    private BigDecimal money = BigDecimal.ZERO;
 
     @ApiModelProperty("环比")
-    private BigDecimal moneyWeekRate;
+    private BigDecimal moneyWeekRate = BigDecimal.ZERO;
 
     @ApiModelProperty("同比")
-    private BigDecimal moneyYearRate;
+    private BigDecimal moneyYearRate = BigDecimal.ZERO;
 
     @ApiModelProperty("占比")
     private String moneyOccupationRate;

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -2207,7 +2207,7 @@
             AND o.tenant_id = #{tenantId}
         </if>
         <if test="customerId != null and customerId != ''">
-            AND o.old_customer_id  = #{customerId}
+            AND o.tenant_id  = #{customerId}
         </if>
         <if test="createSysUserId != null and createSysUserId != ''">
             AND 1=0