Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -253,10 +253,13 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             }
 
             //不使用积分
-            // for (OmsOrderItem orderItem : orderItemList) {
-            //     orderItem.setIntegrationAmount(new BigDecimal(0));
-            // }
+            for (OmsOrderItem orderItem : orderItemList) {
+                orderItem.setIntegrationAmount(new BigDecimal(0));
+            }
         } else {
+            for (OmsOrderItem orderItem : orderItemList) {
+                orderItem.setIntegrationAmount(new BigDecimal(0));
+            }
             //使用积分
             // BigDecimal totalAmount = calcTotalAmount(orderItemList);
             // BigDecimal integrationAmount = getUseIntegrationAmount(orderParam.getUseIntegration(), totalAmount,