Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java

@@ -6,12 +6,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.chaozhanggui.system.cashierservice.annotation.MyLog;
 import com.chaozhanggui.system.cashierservice.bean.LogTag;
 import com.chaozhanggui.system.cashierservice.entity.OrderVo;
+import com.chaozhanggui.system.cashierservice.entity.dto.UpdateVipDTO;
 import com.chaozhanggui.system.cashierservice.entity.vo.CartVo;
 import com.chaozhanggui.system.cashierservice.service.OrderService;
 import com.chaozhanggui.system.cashierservice.sign.Result;
 import com.chaozhanggui.system.cashierservice.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 @CrossOrigin(origins = "*")
@@ -24,6 +27,14 @@ public class OrderController {
     @Autowired
     private OrderService orderService;
 
+    @PutMapping("/updateVip")
+    @MyLog(value = "代客下单 修改会员", tag = LogTag.PLACE)
+    public ResponseEntity<Object> updateVip(
+            @Validated @RequestBody UpdateVipDTO updateVipDTO
+    ) {
+        return ResponseEntity.ok(orderService.updateVip(updateVipDTO));
+    }
+
     @PostMapping("/createCart")
     public Result createCart(@RequestHeader("token") String token,
                              @RequestHeader("loginName") String loginName,
@@ -34,7 +45,7 @@ public class OrderController {
         String userId = jsonObject.getString("accountId");
         return orderService.createCart(cartVo.getMasterId(),cartVo.getProductId(),cartVo.getShopId(),
                 cartVo.getSkuId(),cartVo.getNumber(),userId,clientType,cartVo.getCartId(),cartVo.getIsGift(),
-                cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType());
+                cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType(), cartVo.getTableId());
     }
 
     @MyLog(value = "查询购物车信息", tag = LogTag.CART)
@@ -49,7 +60,7 @@ public class OrderController {
         if (tableId == null && StrUtil.isBlank(masterId)) {
             return Result.fail("masterId和tableId不能同时为空");
         }
-        return orderService.queryCart(masterId,shopId);
+        return orderService.queryCart(masterId,shopId, tableId);
     }
 
 
@@ -90,7 +101,8 @@ public class OrderController {
         JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
         String code = jsonObject.getString("code");
-        return orderService.cartStatus(Integer.valueOf(cartVo.getShopId()),cartVo.getMasterId(),cartVo.getStatus(),userId,cartVo.getUuid(),clientType);
+        return orderService.cartStatus(Integer.valueOf(cartVo.getShopId()),cartVo.getMasterId(),
+                cartVo.getStatus(),userId,cartVo.getUuid(),clientType, cartVo.getVipUserId(), cartVo.getTableId());
     }
     @PostMapping("/createOrder")
     public Result createOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -198,6 +198,26 @@ public class PayController {
     }
 
 
+    /**
+     * 会员支付
+     * @param token
+     * @param loginName
+     * @param clientType
+     * @param orderId
+     * @return
+     */
+    @GetMapping("vipPay")
+    @LimitSubmit(key = "vipPay:%s")
+    public Result vipPay(@RequestHeader("token") String token,
+                          @RequestHeader("loginName") String loginName,
+                          @RequestHeader("clientType") String clientType,
+                          @RequestParam("orderId") String orderId,
+                         @RequestParam("vipUserId") Integer vipUserId){
+        return payService.vipPay(orderId,token, vipUserId);
+    }
+
+
+
 
 
     /**
@@ -216,7 +236,7 @@ public class PayController {
                           @RequestParam("orderId") String orderId,
                           @RequestParam("payAmount") BigDecimal payAmount,
                           @RequestParam("discountAmount") BigDecimal discountAmount){
-        return payService.bankPay(orderId,token,payAmount,discountAmount);
+        return payService.bankPay(orderId,token);
     }
 
 

src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java

@@ -77,11 +77,12 @@ public class ProductController {
             @RequestParam("categoryId") String categoryId,
             @RequestParam("commdityName") String commdityName,
             @RequestParam("masterId") String masterId,
+            @RequestParam("tableId") String tableId,
             @RequestParam("page") int page,
             @RequestParam("pageSize") int pageSize
     ){
 
-        return productService.queryNewCommodityInfo(shopId,categoryId,commdityName,page,pageSize,masterId);
+        return productService.queryNewCommodityInfo(shopId,categoryId,commdityName, tableId,page,pageSize,masterId);
     }
 
     @GetMapping(value = "queryCategory")