fix创建订单获取不到属性

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/service/AddGoodsBOAdapter.java

@@ -64,6 +64,7 @@ public class AddGoodsBOAdapter {
 
         PlatformAddGoodsBO platformAddGoodsBO = BeanUtil.convertBean(baseRequestDTO, PlatformAddGoodsBO::new);
         CartGoods platformProductBO = convert2PlatformProductBO(baseRequestDTO);
+        platformProductBO.setAddCartTime(System.currentTimeMillis());
         platformAddGoodsBO.setAddGoods(platformProductBO);
 
         ManagerServiceBO managerService = ManagerServiceBO.builder()

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/service/CalculationSharingAdapter.java

@@ -85,13 +85,13 @@ public class CalculationSharingAdapter {
             else {//商品券->商品券ID换取商品
                 String goodsId = StringUtils.isNotBlank(cartGoods.getSkuId()) ? cartGoods.getSkuId() : cartGoods.getSpuId();
                 GetCalculationDiscountBO.CalculationDiscountCoupon coupon = new GetCalculationDiscountBO.CalculationDiscountCoupon();
-                coupon.setCode(cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()));
+                coupon.setCode(CommonUtils.getCouponCode(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid()));
                 coupon.setActivityCode(cartGoods.getActivityCode());
                 coupons.add(coupon);
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getSpuId());
+                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), CommonUtils.getCouponCode(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid()));
                 } else {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), null);
+                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), CommonUtils.getCouponCode(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid()));
                 }
             }
         }
@@ -190,6 +190,7 @@ public class CalculationSharingAdapter {
         calculationDiscountGoods.setGoodsId(cartGoods.getGoodsId());
         calculationDiscountGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
         calculationDiscountGoods.setGoodsQuantity(cartGoods.getQty());
+        calculationDiscountGoods.setAddCartTime(cartGoods.getAddCartTime() == null ? 0 : cartGoods.getAddCartTime());
         //if (cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS))
         if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList()) || CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
             calculationDiscountGoods.setOriginalPrice(cartGoods.getFinalPrice()!=null ? cartGoods.getFinalPrice() : cartGoods.getOriginalPrice());
@@ -286,6 +287,7 @@ public class CalculationSharingAdapter {
         calculationDiscountGoods.setOriginalPrice(originalPrice);
         calculationDiscountGoods.setMemberDiscount(100);
         calculationDiscountGoods.setCouponCode(couponCode);
+        calculationDiscountGoods.setAddCartTime(cartGoods.getAddCartTime() == null ? 0 : cartGoods.getAddCartTime());
         this.setCalculationDiscountGoods(calculationDiscountGoodsList,calculationDiscountGoods);
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/promotion/GetCalculationDiscountBO.java

@@ -121,6 +121,10 @@ public class GetCalculationDiscountBO {
          */
         private Long originalPrice;
         /**
+         * 加车时间
+         */
+        private Long addCartTime;
+        /**
          * 折扣比例
          * 例如8折为80
          */

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

@@ -239,6 +239,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
             String spuId = baseRequestBO.getSpuId();
             String couponCode = CommonUtils.getCouponCode(baseRequestBO.getCouponCode(), spuId);
 
+            cartGoods.setAddCartTime(System.currentTimeMillis());
             cartGoods.setSpuId(couponCode);
             cartGoods.setSkuId(StringUtils.isEmpty(spqBO.getSkuId()) ? spqBO.getSpuId() : spqBO.getSkuId());
             cartGoods.setOriginalPrice(0L);