Merge branch 'dev_v1.3.8_20221107'

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -1344,8 +1344,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                                          .reduce(BigDecimal.ZERO, BigDecimal::add);
         BigDecimal precisionAmount = coupon.subtract(reduce);
         for (OmsOrderItem omsOrderItem : orderItemList) {
-            BigDecimal multiply = omsOrderItem.getRealAmount()
-                                              .multiply(BigDecimal.valueOf(omsOrderItem.getProductQuantity()));
+            BigDecimal multiply = omsOrderItem.getProductPrice()
+                                              .multiply(BigDecimal.valueOf(omsOrderItem.getProductQuantity())).subtract(omsOrderItem.getCouponAmount());
             if (multiply.compareTo(precisionAmount) >=0) {
                 omsOrderItem.setPrecisionAmount(precisionAmount);
                 break;

service.md

@@ -1,6 +1,6 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [x] admin-server
+- [ ] admin-server
 - [ ] teacher-server
 - [ ] student-server
 - [ ] website-server
@@ -11,5 +11,5 @@
 - [ ] classroom-server
 - [ ] cms-server
 - [ ] mall-admin
-- [ ] mall-server
+- [x] mall-server
 - [ ] EOF