订单保存积分商品信息与展示

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1529,6 +1529,9 @@ public class OrderSdkAdapter {
             case "SINGLE_PRODUCT_REDUCTION":
                 type = 22;
                 break;
+            case "SCORE_PRODUCT_ACTIVITY":
+                type = 28;
+                break;
             default:
                 break;
         }
@@ -3053,6 +3056,9 @@ public class OrderSdkAdapter {
         if (StringUtils.isNotBlank(product.getSplitIndex())) {
             extInfo.setSplitIndex(product.getSplitIndex());
         }
+        if (product.getScore() != null) {
+            extInfo.setScore(product.getScore());
+        }
         extInfo.setStapleFood(product.getStapleFood());
 
         extInfo.setOriginalGoodsUid(product.getOriginalGoodsUid());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -50,6 +50,7 @@ public enum OldOrderAccountType {
     MEMBER_PRICE_DISCOUNT(220, "会员价优惠", "MEMBER_PRICE_DISCOUNT"),
     COCO_PRODUCT_CASH_COUPON(36, "coco商品代金券","COCO_PRODUCT_CASH_COUPON"),
     FULL_BUYM_SENDN(230, "满赠","FULL_BUYM_SENDN"),
+    SCORE_PRODUCT_ACTIVITY(28, "积分商品活动","SCORE_PRODUCT_ACTIVITY"),
     SINGLE_PRODUCT_REDUCTION(22, "单品立减","SINGLE_PRODUCT_REDUCTION");
     private Integer code;
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -49,6 +49,7 @@ public enum QueryOrderAccountType {
     WITH_ORDER_BUY_COUPON_FEE("WITH_ORDER_BUY_COUPON_FEE", "随单买月卡"),
     COCO_PRODUCT_CASH_COUPON("COCO_PRODUCT_CASH_COUPON", "coco商品代金券"),
     FULL_BUYM_SENDN("FULL_BUYM_SENDN", "满赠"),
+    SCORE_PRODUCT_ACTIVITY("SCORE_PRODUCT_ACTIVITY", "积分商品活动"),
     SINGLE_PRODUCT_REDUCTION("SINGLE_PRODUCT_REDUCTION", "单品立减")
     ;
     private String code;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-public class    BaseCreateOrderRequest extends BaseConfig {
+public class BaseCreateOrderRequest extends BaseConfig {
 
     /**
      * 商户ID 必填
@@ -230,6 +230,8 @@ public class    BaseCreateOrderRequest extends BaseConfig {
         //门店英文名称
         private String storeNameEn;
 
+        private Integer totalScore;
+
     }
 
     @Data

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -261,4 +261,7 @@ public class CreateOrderProductRequest extends BaseConfig {
      * 是否是买3赠1券商品
      */
     private int isB3S1Coupon = 0;
+
+    //积分商品活动使用总积分
+    private Long score;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -121,4 +121,7 @@ public class OrderProductAddInfoDto extends BaseConfig {
      * 是否赠品
      */
     private Boolean isSendGoods;
+
+    //积分商品活动使用总积分
+    private Long score;
 }

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

@@ -1202,6 +1202,7 @@ public class OrderAdapter {
                 orderExtInfoDto = gson.fromJson(extInfo, OrderExtInfoDto.class);
             }
             responseVo.setWxappid(orderExtInfoDto != null ? orderExtInfoDto.getAppid() : "");
+            responseVo.setTotalScore(orderExtInfoDto != null ? orderExtInfoDto.getTotalScore() : 0L);
             responseVo.setReserveDeliveryTime("");
             if (ordersBean.getGmtExpect() != null) {
                 Date gmtExpect = new Date(ordersBean.getGmtExpect());
@@ -2334,7 +2335,7 @@ public class OrderAdapter {
                 }
                 productVo.setInventedParentActivitiesVo(inventedParentActivityVos);
             }
-
+            productVo.setScore(orderProductAddInfoDto.getScore());
             // 购物车行id
             productVo.setCid(orderProductAddInfoDto.getCartGoodsUid());
             // 购物车行父id
@@ -2758,6 +2759,7 @@ public class OrderAdapter {
 
         createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
         createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());
+        createOrderProductDemoDto.setScore(cartGoodsDetailDto.getScore());
         return createOrderProductDemoDto;
     }
 
@@ -2913,6 +2915,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_231.getCode().equals(activityType)) {
             return OldOrderAccountType.MONTH_CARD_TOTAL_DISCOUNT;
         }
+        if (ActivityTypeEnum.TYPE_28.getCode().equals(activityType)) {
+            return OldOrderAccountType.SCORE_PRODUCT_ACTIVITY;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }
 

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

@@ -110,6 +110,11 @@ public class ShoppingCartGoodsDto {
     private Long payCardFee;
 
     /**
+     * 积分商品活动使用总积分
+     */
+    private Long totalScore;
+
+    /**
      * 月享卡总优惠金额
      */
     private MonthCardDiscount monthCardDiscount;
@@ -138,6 +143,9 @@ public class ShoppingCartGoodsDto {
          * 商品行原始价格
          */
         private Long originalPrice;
+
+        //积分商品活动使用总积分
+        private Long score;
         /**
          * 商品图片
          */

order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java

@@ -201,6 +201,8 @@ public class ProductVo {
      * 商品参与活动类型(61:买一赠一)
      */
     private Integer activityType;
+
+    private Long score;
     @Data
     @NoArgsConstructor
     public static class ProductLabel {

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -340,6 +340,8 @@ public class QueryOrderResponseVo {
      */
     private Long refundIntervalTime = 0l;
 
+    private Long totalScore;
+
 
     private List<ProductVo> products;
 

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -63,6 +63,7 @@ public enum ActivityTypeEnum {
     TYPE_221(221, "集点活动"),
     TYPE_320(320, "会员价优惠"),
     TYPE_36(36, "coco商品代金券"),
+    TYPE_28(28, "积分商品活动"),
     TYPE_230(230, "满赠");
 
     private Integer code;

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

@@ -2962,6 +2962,9 @@ public class OrderServiceImpl implements Orderservice {
             orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
             orderExtInfoDto.setIsContinueExchange(sendPoint.getIsContinueExchange());
         }
+        if (null != shoppingCartGoodsDto && null != shoppingCartGoodsDto.getTotalScore()) {
+            orderExtInfoDto.setTotalScore(shoppingCartGoodsDto.getTotalScore());
+        }
         return orderExtInfoDto;
     }
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -207,5 +207,5 @@ public class OrderExtInfoDto {
      */
     private String province;
 
-
+    private Long totalScore;
 }

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

@@ -110,6 +110,7 @@ public class DefaultPromotionService implements IPromotionService {
         shoppingCartGoodsDto.setIsDiscountDelivery(shoppingCartGoodsResponseVo.getIsDiscountDelivery());
         shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
         shoppingCartGoodsDto.setDeliveryDiscountDesc(shoppingCartGoodsResponseVo.getDeliveryDiscountDesc());
+        shoppingCartGoodsDto.setTotalScore(shoppingCartGoodsResponseVo.getTotalScore());
         List<CartGoods> cartGoodsList = shoppingCartGoodsResponseVo.getProducts();
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods> apportionGoodsList =
                 calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getApportionGoods();