fix:订单按最新价格

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

@@ -284,6 +284,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         Map<String, Object> result = new HashMap<>();
         result.put("order", order);
         result.put("orderItemList", orderItemList);
+        if (order.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
+            paySuccess(order.getId(),order.getPayType());
+            order.setStatus(1);
+        }
         return result;
     }
 
@@ -520,14 +524,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             orderPayRes.setMessage("订单已付款或已关闭");
             return orderPayRes;
         }
-        if (detail.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
-            orderPayRes.setPay_amt(detail.getPayAmount().setScale(2, RoundingMode.HALF_UP).toString());
-            orderPayRes.setPay_info("");
-            orderPayRes.setPayChannel(payReq.getPayChannel().getCode());
-            orderPayRes.setPaymentNo("");
-            orderPayRes.setStatus(true);
-            return orderPayRes;
-        }
         // UserOrderPayment userOrderPayment = userOrderPaymentService.getByOrderNo(detail.getOrderSn(),
         //                                              payReq.getPayChannel(),TradeStatusEnum.pending);
         //

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

@@ -49,6 +49,7 @@ public class OmsPromotionServiceImpl implements OmsPromotionService {
                     PmsSkuStock skuStock = getOriginalPrice(promotionProduct, item.getProductSkuId());
                     if (skuStock  != null) {
                         //单品促销使用原价
+                        originalPrice = skuStock.getPrice();
                         cartPromotionItem.setPrice(originalPrice);
                         cartPromotionItem.setReduceAmount(originalPrice.subtract(skuStock.getPromotionPrice()));
                         cartPromotionItem.setRealStock(skuStock.getStock() - skuStock.getLockStock());
@@ -182,8 +183,10 @@ public class OmsPromotionServiceImpl implements OmsPromotionService {
             cartPromotionItem.setReduceAmount(new BigDecimal(0));
             PmsSkuStock skuStock = getOriginalPrice(promotionProduct,item.getProductSkuId());
             if(skuStock!=null){
+                cartPromotionItem.setPrice(skuStock.getPrice());
                 cartPromotionItem.setRealStock(skuStock.getStock()-skuStock.getLockStock());
             } else {
+                cartPromotionItem.setPrice(promotionProduct.getPrice());
                 cartPromotionItem.setRealStock(promotionProduct.getStock() - promotionProduct.getLockStock());
             }
             cartPromotionItem.setIntegration(promotionProduct.getGiftPoint());