submit

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

@@ -321,8 +321,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 }
                 //成本 = 订单成本+供应商数量结算成本+供应商时间结算成本
                 BigDecimal cost = getInstTimeSettleCost(item);
-                BigDecimal add = item.getOrderCost().add(cost).add(item.getInstCost());
-                item.setOrderCost(add);
+                if (ObjectUtils.isNotNull(cost)){
+                    BigDecimal instCost = ObjectUtils.isNotNull(item.getInstCost())?item.getInstCost():BigDecimal.ZERO;
+                    BigDecimal add = item.getOrderCost().add(cost).add(instCost);
+                    item.setOrderCost(add);
+                }
                 //退款审核角色
                 if (Arrays.asList(0, 2).contains(item.getRefundStatus())) {
                     String refundSn = "";

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

@@ -1006,6 +1006,8 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
                     User user = userService.getById(order.getUserId());
                     orderVo.setUserName(user.getRealname());
                     orderVo.setUserCard(EncryptHandler.decrypt(user.getIdCard()));
+                    //业务层次
+
                 } else {
                     TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getOrderSn, item.getOrderSn()));
                     orderVo.setCreateNo(oldOrder.getCreateNo());