修复不能用其他优惠券问题

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

@@ -102,6 +102,11 @@ public class CreateOrderVo {
     private Byte marketingType;
 
     /**
+     *  1、结算页 0
+     */
+    private Integer flag;
+
+    /**
      * 到店类型  orderType 传1的时候    如果reachStoreTyp为空转成订单类型4  如果不为空存储4(打包带走)和5（店内就餐）
      */
     private Integer reachStoreType;

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

@@ -657,6 +657,7 @@ public class CheckOrder {
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(buyMemberCard)
                 .menuType(createOrderVo.getMenuType())
+                .flag(1) //结算页
                 // 预定单类型传递 购物车中进行查询
                 .bizType(createOrderVo.getBizType())
                 .build();

order-application-service/src/main/java/cn/freemud/service/thirdparty/ShoppingCartClient.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "SHOPPING-CART-APPLICATION-SERVICE",url = "${saas.newshoppingcartclient.feign.url}")
+@FeignClient(name = "SHOPPING-CART-APPLICATION-SERVICE",url = "http://localhost:9211")
 @RequestMapping(value = "/shoppingCart",produces = {"application/json;charset=UTF-8"})
 public interface ShoppingCartClient {
 

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

@@ -56,7 +56,7 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      *  1：结算页 0：点餐页
      * 结算页会查询用户优惠券，点餐页不会查询用户优惠券
      */
-    private Integer flag;
+    private Integer flag = 1;
     /**
      * 优惠券code
      */