fix:优惠券

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

@@ -236,8 +236,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             // if(data != null) {
             //     couponAmount = data.getDiscountedPrices();
             // }
-            if (couponAmount.compareTo(orderParam.getOrderAmount()) > 0) {
-                couponAmount = orderParam.getOrderAmount();
+            if (couponAmount.compareTo(amount) > 0) {
+                couponAmount = amount;
             }
             handleCouponAmount(orderItemList, couponAmount);
         }
@@ -417,7 +417,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         BigDecimal bigDecimal = new BigDecimal(balanceAmount1);
         if (BigDecimal.ZERO.compareTo(bigDecimal) !=0 ) {
             order.setIntegrationAmount(bigDecimal);
-            order.setPayAmount(orderParam.getOrderAmount().subtract(bigDecimal));
+            order.setPayAmount(order.getPayAmount().subtract(bigDecimal));
             orderMapper.updateByPrimaryKeySelective(order);
         }
         result.put("pay",data);

mec-web/src/main/resources/bootstrap-local.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=cfd539dc-7be4-4ef8-85ee-42eef6fe34b6
+spring.cloud.nacos.config.namespace=6488ff54-d97a-43ea-8c7b-d1d25bb54622
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}