商品改造

mec-application/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -97,8 +97,6 @@ public class StudentOrderController extends BaseController {
     @Autowired
     private VipGroupActivityService vipGroupActivityService;
     @Autowired
-    private SellOrderService sellOrderService;
-    @Autowired
     private TenantOrderRecordService tenantOrderRecordService;
     @Autowired
     private OrderPayOpsService orderPayOpsService;

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

@@ -451,7 +451,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 subTotalBalance = subTotalBalance.subtract(goodsBalance);
                 remitAmount = goodsRatioAmount.multiply(couponRemitAmount).setScale(2, RoundingMode.DOWN);
                 subCouponRemitAmount = subCouponRemitAmount.subtract(remitAmount);
-                actualAmount = expectAmount.subtract(goodsBalance).subtract(remitAmount);
+                actualAmount = goodsRatioAmount.multiply(actualTotalAmount).setScale(2, RoundingMode.DOWN);
                 subTotalActualAmount = subTotalActualAmount.subtract(actualAmount);
             }
             //剩余预计金额