保存优惠数量

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

@@ -96,6 +96,9 @@ public class OrderAdapter {
 
     public static final String PAY_CODE_10102 = "10102"; // svc储值卡支付，可用于判断订单是否用储值卡支付
 
+    @Value("${mccafe.partner.id}")
+    private String mcCafePartnerId;
+
     @Value("${saas.reverseNotifyiDcUrl}")
     private String reverseNotifyiDcUrl;
     @Value("${saas.refund.notify.callback}")
@@ -149,7 +152,13 @@ public class OrderAdapter {
                 createOrderProductDto.setIgnoreProductPrice(1);
                 products.add(createOrderProductDto);
                 if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
-                    createOrderProductDto.setAccounts(getAccounts(createOrderProductDto, cartGoodsDetailDto.getActivityDiscountsDtos()));
+                    List<CreateOrderAccountRequest> accounts = null;
+                    if(mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
+                        accounts = getMCCafeAccounts(createOrderProductDto, cartGoodsDetailDto.getActivityDiscountsDtos());
+                    } else {
+                        accounts = getAccounts(createOrderProductDto, cartGoodsDetailDto.getActivityDiscountsDtos());
+                    }
+                    createOrderProductDto.setAccounts(accounts);
                 }
             }
         }
@@ -290,6 +299,24 @@ public class OrderAdapter {
         return orderAccountDtos;
     }
 
+    public List<CreateOrderAccountRequest> getMCCafeAccounts(CreateOrderProductRequest createOrderProductDto, List<ActivityDiscountsDto> activityDiscountsDtos) {
+        List<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
+        for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
+            CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
+                    .accountId(activityDiscountsDto.getActivityCode())
+                    .name(activityDiscountsDto.getActivityName())
+                    .price(activityDiscountsDto.getDiscountAmount().longValue())
+                    .accountType(getQueryOrderAccountType(getOrderAccountType(activityDiscountsDto.getActivityType())))
+                    .sequence(createOrderProductDto.getSequence())
+                    .productId(createOrderProductDto.getSpecification())
+                    .discountQty((activityDiscountsDto.getActualActivityGoodsNumber()==null||activityDiscountsDto.getActualActivityGoodsNumber()==0)
+                            ?createOrderProductDto.getNumber():activityDiscountsDto.getActualActivityGoodsNumber())
+                    .build();
+            orderAccountDtos.add(createOrderAccountDto);
+        }
+        return orderAccountDtos;
+    }
+
 
     /**
      * 计算用户收货地址实际配送费
@@ -1913,7 +1940,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
         createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
         createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
-        //createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
+        createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
         createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ActivityDiscountsDto.java

@@ -21,4 +21,5 @@ public class ActivityDiscountsDto {
     private String activityName;
     private Integer discountAmount;
     private Integer activityType;
+    private Integer actualActivityGoodsNumber;
 }

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -173,7 +173,7 @@ public class ShoppingCartGoodsDto {
         private String customerCode;
 
         /**商品货号**/
-//        private String productCode;
+        private String productCode;
 
         /** 商品统计分类编号**/
         private String classificationId;