Merge remote-tracking branch 'origin/master'

yami-shop-platform/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   # 环境 dev|prod|docker quartz定时任务
   profiles:
-    active: dev
-#    active: prod
+#    active: dev
+    active: prod
   #文件上传设置
   servlet:
 

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBOrderService.java

@@ -404,12 +404,12 @@ public class HBOrderService implements IHBOrderService {
 
         //订单商品明细
         List<OrderProduct> orderProductList = new ArrayList<>();
-        OrderProduct orderProduct = new OrderProduct();
 
         List<OrderItem> listByOrderNumber = orderItemMapper.getListByOrderNumber(order.getOrderNumber());
         for (OrderItem orderItem : listByOrderNumber) {
             Product product1 = productMapper.selectById(orderItem.getProdId());
             Sku sku = skuMapper.selectById(orderItem.getSkuId());
+            OrderProduct orderProduct = new OrderProduct();
             orderProduct.setChannelSkuId(sku.getSkuId().toString());
             orderProduct.setOutSkuId(sku.getPartyCode());
             orderProduct.setHbSkuId(Long.parseLong(sku.getHbSkuId()));