商城商品关联管乐迷

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1383,7 +1383,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                 StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
                                 detail.setType(OrderDetailTypeEnum.valueOf(goods.getType() == GoodsType.INSTRUMENT?"MUSICAL":goods.getType().getCode()));
                                 detail.setGoodsIdList(goods.getId().toString());
-                                detail.setPrice(goodsVo.getRealAmount());
+                                BigDecimal totalAmount = goodsVo.getRealAmount().multiply(new BigDecimal(goodsVo.getProductQuantity()));
+                                detail.setPrice(totalAmount);
                                 detail.setRemitFee(BigDecimal.ZERO);
                                 detail.setPaymentOrderId(paymentOrderId);
                                 orderDetails.add(detail);
@@ -1393,7 +1394,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                 sellOrder.setTransNo(transNo);
                                 sellOrder.setOrderId(paymentOrderId);
                                 sellOrder.setOrderNo(orderNo);
-                                BigDecimal totalAmount = goodsVo.getRealAmount().multiply(new BigDecimal(goodsVo.getProductQuantity()));
                                 sellOrder.setExpectAmount(goodsVo.getRealAmount());
                                 if(goodsOrderItemVOS.size() - 1 == i){
                                     sellOrder.setBalanceAmount(subjectBalance);
@@ -1401,6 +1401,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                     //获取比例
                                     BigDecimal ratioAmount = totalAmount.divide(studentGoodsSellDto.getExpectAmount(), 6, BigDecimal.ROUND_HALF_UP);
                                     BigDecimal multiply = balancePaymentAmount.multiply(ratioAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+                                    subjectBalance = subjectBalance.subtract(multiply);
                                     sellOrder.setBalanceAmount(multiply);
                                 }
                                 sellOrder.setActualAmount(totalAmount.subtract(sellOrder.getBalanceAmount()));