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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1390,6 +1390,7 @@ public class OrderAdapter {
             if (enableRefundCodes.contains(ordersBean.getStatus()) && PayStatus.HAVE_PAID.getCode().equals(ordersBean.getPayStatus())) {
                 responseVo.setEnableRefund(true);
             }
+            responseVo.setMarketingType(ordersBean.getMarketingType());
             list.add(responseVo);
         });
         return list;
@@ -2027,6 +2028,7 @@ public class OrderAdapter {
             productVos.sort(Comparator.comparing(ProductVo::getSequence));
             responseVo.setProducts(productVos);
             responseVo.setProductNum(productVos.stream().mapToInt(ProductVo::getQty).sum());
+            responseVo.setOrderUserNum(productVos.stream().filter(product -> StringUtils.isNotEmpty(product.getUserId())).map(ProductVo::getUserId).distinct().count());
         }
     }
 
@@ -2061,6 +2063,11 @@ public class OrderAdapter {
         productVo.setSequence(productBean.getSequence());
         productVo.setQty(productBean.getNumber());
         productVo.setSpecification("");
+        productVo.setUserId(productBean.getUserId());
+        productVo.setOpenId(productBean.getOpenId());
+        productVo.setNickName(productBean.getNickName());
+        productVo.setPhotoUrl(productBean.getPhotoUrl());
+        productVo.setPackPrice(productBean.getPackPrice());
         List<InventedParentActivityVo> inventedParentActivityVos = new ArrayList<>();
         String attributeNames = "";
         if (StringUtils.isNotBlank(productBean.getAddInfo()) && productBean.getAddInfo().contains("attributeNames")) {
@@ -2453,8 +2460,14 @@ public class OrderAdapter {
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
+        createOrderProductDemoDto.setUserId(cartGoodsDetailDto.getUserId());
+        createOrderProductDemoDto.setOpenId(cartGoodsDetailDto.getOpenId());
+        createOrderProductDemoDto.setNickName(cartGoodsDetailDto.getUserName());
+        createOrderProductDemoDto.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
+        createOrderProductDemoDto.setPackPrice(cartGoodsDetailDto.getPackPrice());
+
         createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
-        createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());
+        createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid()
         return createOrderProductDemoDto;
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -413,7 +413,7 @@ public class OrderServiceImpl implements Orderservice {
             dto.setPartnerId(partnerId);
             dto.setStoreId(storeId);
             dto.setTrackingNo(LogThreadLocal.getTrackingNo());
-            paymentQueueService.paymentCallback(dto);
+            //paymentQueueService.paymentCallback(dto);
         } catch (Exception e) {
             log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
         }
@@ -435,7 +435,7 @@ public class OrderServiceImpl implements Orderservice {
             dto.setStoreId(storeId);
             dto.setPayChannelType(payChanelType);
             dto.setTrackingNo(LogThreadLocal.getTrackingNo());
-            paymentQueueService.paymentCallback(dto);
+            //paymentQueueService.paymentCallback(dto);
         } catch (Exception e) {
             log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
         }
@@ -1846,6 +1846,9 @@ public class OrderServiceImpl implements Orderservice {
                 if (baseResponse != null) {
                     return baseResponse;
                 }
+                // 删除订单 通知活动添加商品库存
+                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus());
+                return ResponseUtil.success();
             }
 
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java

@@ -237,13 +237,12 @@ public class BuySendPromotionService implements IPromotionService {
         }
         if (manyOrSingle) {
             // 多规格
-            if (!Objects.equals(sendGoodsMap.get(cartGood.getSkuId()).getGoodsId(), cartGood.getSkuId())) {
+            if (!Objects.equals(sendGoodsMap.get(cartGood.getSkuId()).getOriginalGoodsUid(), cartGood.getCartGoodsUid())) {
                 return;
             }
         } else {
             // 单品
-            List<String> spuIds = newCartGoodsList.stream().map(CartGoods::getSpuId).collect(Collectors.toList());
-            if (spuIds.contains(cartGood.getSpuId())) {
+            if (!Objects.equals(sendGoodsMap.get(cartGood.getSpuId()).getOriginalGoodsUid(), cartGood.getCartGoodsUid())) {
                 return;
             }
         }