套餐优化

src/main/java/cn/hnthyy/thmz/service/impl/thmz/DiscountServiceImpl.java

@@ -402,8 +402,10 @@ public class DiscountServiceImpl implements DiscountService {
                     List<ZdChargeItem> zdChargeItems = null;
                     try {
                          zdChargeItems = jcJyItemChargeService.queryJcJyItemChargeByCode(mzYjReq.getOrderCode(), Integer.valueOf(Convert.toInt(mzYjReq.getReqType())-1));
+                         log.info("zdChargeItems:{}",JsonUtil.object2Json(zdChargeItems));
                         if(CollUtil.isNotEmpty(zdChargeItems)){
-                            yjTotalFee = zdChargeItems.stream().map(item -> item.getTotalAmount().multiply(discountRate)).reduce(BigDecimal.ZERO, BigDecimal::add);
+                          BigDecimal  yjTempFee = zdChargeItems.stream().map(item -> item.getTotalAmount().multiply(discountRate)).reduce(BigDecimal.ZERO, BigDecimal::add);
+                            yjTotalFee = yjTotalFee.add(yjTempFee);
                         }
                     }catch (MzException e){
                         throw new  BizException(e.getMessage(),e);
@@ -417,7 +419,8 @@ public class DiscountServiceImpl implements DiscountService {
                         continue;
                     }
                     BigDecimal unitPrice = mzChargeDetail.getUnitPrice().multiply(discountRate);
-                     xmTotalFee = unitPrice.multiply(BigDecimal.valueOf(mzChargeDetail.getQuantity()).multiply(BigDecimal.valueOf(mzChargeDetail.getDrugWin())));
+                    BigDecimal temp = unitPrice.multiply(BigDecimal.valueOf(mzChargeDetail.getQuantity()).multiply(BigDecimal.valueOf(mzChargeDetail.getDrugWin())));
+                    xmTotalFee = xmTotalFee.add(temp);
                 }
             }
         }