华莱士升级

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

@@ -437,4 +437,9 @@ public class CreateOrderVo {
          */
         private Integer index;
     }
+
+    /**
+     * 购买类型 0=普通购买 1=立即购买 ，默认值为普通购买
+     */
+    private int buyType = 0;
 }

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

@@ -201,4 +201,9 @@ public class ShoppingCartInfoRequestVo {
         private Integer index;
     }
 
+    /**
+     * 购买类型 1=普通购买 1=立即购买 ，默认值为普通购买
+     */
+    private int buyType = 0;
+
 }

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

@@ -162,6 +162,7 @@ public class CheckMallOrder {
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .channelType(OrderChannelType.SAASMALL.getCode())
                 .menuType(BusinessTypeEnum.SAAS_MALL.getName())
+                .buyType(createOrderVo.getBuyType())
                 .build();
         // 通过购物车获取优惠信息
         GetShoppingCartGoodsApportionDto requestDto = new GetShoppingCartGoodsApportionDto();

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

@@ -39,7 +39,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableSwagger2
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
 @EnableAspectJAutoProxy
 @ComponentScan({"cn.freemud", "com.freemud"})
 @MapperScan({"cn.freemud.*.dao",

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/AddShoppingCartGoodsRequestVo.java

@@ -12,6 +12,8 @@
  */
 package cn.freemud.entities.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
@@ -19,6 +21,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 import java.util.List;
 
 @Data
+@ApiModel
 public class AddShoppingCartGoodsRequestVo extends BaseRequestVo{
 
     @NotEmpty(message = "sessionId不能为空")
@@ -101,8 +104,9 @@ public class AddShoppingCartGoodsRequestVo extends BaseRequestVo{
     private String couponCode;
 
     /**
-     * 购买类型 1=普通购买 2=立即购买 ，默认值为普通购买
+     * 购买类型 1=普通购买 1=立即购买 ，默认值为普通购买
      */
-    private int buyType = 1;
+    @ApiModelProperty(value = "购买类型 1=普通购买 1=立即购买 ，默认值为普通购买")
+    private int buyType = 0;
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -213,5 +213,9 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
          */
         private Integer index;
     }
+    /**
+     * 购买类型 0=普通购买 1=立即购买 ，默认值为普通购买
+     */
+    private int buyType = 0;
 
 }

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

@@ -160,7 +160,7 @@ public class AssortmentSdkService {
      */
     public List<CartGoods> setShoppingCart(String partnerId, String storeId, String useId, List<CartGoods> cartGoodsList, String sessionId, String tableNumber, ShoppingCartBaseService shoppingCartService) {
         int buyType = 0;
-        return setNowBuyShoppingCart(buyType,partnerId, storeId, useId ,  sessionId,  tableNumber,  shoppingCartService);
+        return setNowBuyShoppingCart(buyType,partnerId, storeId, useId , cartGoodsList, sessionId,  tableNumber,  shoppingCartService);
     }
 
     /**
@@ -177,7 +177,7 @@ public class AssortmentSdkService {
         cartParamDto.setTableNumber(tableNumber);
         cartParamDto.setUserId(useId);
         //立即购买==1 ，设置新的缓存key
-        if(cartParamDto.getBuyType() == ShoppingCartConstant.NOW_BUY_TYPE) {
+        if(buyType == ShoppingCartConstant.NOW_BUY_TYPE) {
             cartParamDto.setBuyType(buyType);
         }
         cartParamDto.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(cartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
@@ -319,7 +319,7 @@ public class AssortmentSdkService {
         cartParamDto.setSessionId(sessionId);
         cartParamDto.setTableNumber(tableNumber);
         cartParamDto.setUserId(useId);
-        if(cartParamDto.getBuyType() == ShoppingCartConstant.NOW_BUY_TYPE) {
+        if(buyType == ShoppingCartConstant.NOW_BUY_TYPE) {
             cartParamDto.setBuyType(buyType);
         }
         // 根据不同点餐类型获取不同购物车实例
@@ -347,7 +347,7 @@ public class AssortmentSdkService {
         cartParamDto.setTableNumber(tableNumber);
         cartParamDto.setUserId(userId);
         //立即购买==1 ，设置新的缓存key
-        if(cartParamDto.getBuyType() == ShoppingCartConstant.NOW_BUY_TYPE) {
+        if(buyType == ShoppingCartConstant.NOW_BUY_TYPE) {
             cartParamDto.setBuyType(buyType);
         }
         BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.updateGoodsQty(cartParamDto, LogThreadLocal.getTrackingNo());

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

@@ -279,9 +279,13 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String appId = shoppingCartInfoRequestVo.getAppId();
         String storeId = this.getBindMallShopId(appId);
         shoppingCartInfoRequestVo.setShopId(storeId);
-
+        List<CartGoods> cartGoodsList = new ArrayList<>();
         // 获取购物车商品
-        List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, "", shoppingCartBaseService);
+        if(ShoppingCartConstant.NOW_BUY_TYPE == shoppingCartInfoRequestVo.getBuyType()) {
+            cartGoodsList = assortmentSdkService.getNowBuyShoppingCart(ShoppingCartConstant.NOW_BUY_TYPE,partnerId, storeId, userId, null, "", shoppingCartBaseService);
+        }else{
+            cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, "", shoppingCartBaseService);
+        }
         if (cartGoodsList == null) {
             cartGoodsList = new ArrayList<>();
         }