1.通知中心相关接口

2.代客下单

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java

@@ -0,0 +1,89 @@
+package cn.ysk.cashier.controller.product;
+
+import cn.ysk.cashier.annotation.AnonymousAccess;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.dto.shoptable.AddCartDTO;
+import cn.ysk.cashier.dto.shoptable.ClearCartDTO;
+import cn.ysk.cashier.dto.shoptable.RemoveCartDTO;
+import cn.ysk.cashier.service.product.TbProductService;
+import cn.ysk.cashier.service.shop.TbShopTableService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.Validator;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.xml.bind.ValidationException;
+
+@RestController
+@RequestMapping("/api/place")
+public class TbPlaceController {
+
+    private final TbShopTableService tbShopTableService;
+
+    private final TbProductService tbProductService;
+    private final Validator validator;
+
+
+    @AnonymousAccess
+    @GetMapping ("/activate")
+    @ApiOperation("查询/product")
+    public ResponseEntity<Object> queryActivateTbProductInfo(
+            @RequestParam(defaultValue = "0") Integer page,
+            @RequestParam(defaultValue = "30") Integer size,
+            @RequestParam(required = false) Integer categoryId,
+            @RequestParam Integer shopId,
+            @RequestParam(required = false) Integer productId
+    ){
+        return new ResponseEntity<>(tbProductService.activateProduct(page, size, categoryId, shopId, productId),HttpStatus.OK);
+    }
+
+    public TbPlaceController(TbShopTableService tbShopTableService, TbProductService tbProductService, Validator validator) {
+        this.tbShopTableService = tbShopTableService;
+        this.tbProductService = tbProductService;
+        this.validator = validator;
+    }
+    @AnonymousAccess
+    @PostMapping("/addCart")
+    @Log("代客下单:#addCartDTO.tableId")
+    @ApiOperation("代客下单/shop/table")
+    public ResponseEntity<Object> addCartForUser(@Valid @RequestBody AddCartDTO addCartDTO) {
+        tbShopTableService.addCartForUser(addCartDTO);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @AnonymousAccess
+    @DeleteMapping("/removeCart")
+    @Log("代客下单 删除购物车商品")
+    @ApiOperation("代客下单 清空购物车 /shop/table")
+    public ResponseEntity<Object> removeCart(@Validated @RequestBody RemoveCartDTO removeCartDTO) {
+        tbShopTableService.removeCart(removeCartDTO);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @AnonymousAccess
+
+    @DeleteMapping("/clearCart")
+    @Log("代客下单 清空购物车")
+    @ApiOperation("代客下单 清空购物车 /shop/table")
+    public ResponseEntity<Object> clearCart(@Validated @RequestBody ClearCartDTO clearCartDTO) {
+        tbShopTableService.clearCart(clearCartDTO);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @AnonymousAccess
+
+    @GetMapping("/cart")
+    @Log("代客下单 查询购物车")
+    @ApiOperation("代客下单 查询购物车 /shop/table")
+    public ResponseEntity<Object> getCart(
+            @RequestParam Long tableId,
+            @RequestParam(defaultValue = "1") Integer page,
+            @RequestParam(defaultValue = "10") Integer size,
+            @RequestParam Integer shopId
+    ) {
+        return ResponseEntity.ok(tbShopTableService.getCart(tableId, page, size, shopId));
+    }
+
+}

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java

@@ -1,5 +1,6 @@
 package cn.ysk.cashier.controller.product;
 
+import cn.ysk.cashier.annotation.AnonymousAccess;
 import cn.ysk.cashier.annotation.Log;
 import cn.ysk.cashier.dto.product.TbProductSortCriteria;
 import cn.ysk.cashier.vo.TbProductVo;
@@ -32,6 +33,8 @@ public class TbProductController {
         return new ResponseEntity<>(tbProductService.queryAll(criteria, false),HttpStatus.OK);
     }
 
+
+
     @GetMapping("/list")
     @ApiOperation("查询/productForAdmin")
     public ResponseEntity<Object> queryTbProductForAdmin(TbProductQueryCriteria criteria){
@@ -49,12 +52,15 @@ public class TbProductController {
     public Object queryTbProductInfo(@PathVariable("product") Integer product)throws Exception{
         return tbProductService.findByProductId(product);
     }
+
     @GetMapping ("/productList")
     @ApiOperation("查询/product")
     public Object queryTbProductInfo(@RequestParam List<String> productList){
         return tbProductService.findByProductList(productList);
     }
 
+
+
     @PostMapping("/upProSort")
     @ApiOperation("修改商品排序")
     public ResponseEntity<Object> upProSort(@RequestBody TbProductSortCriteria param){

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/MsgController.java

@@ -0,0 +1,78 @@
+package cn.ysk.cashier.controller.shop;
+
+import cn.ysk.cashier.annotation.AnonymousAccess;
+import cn.ysk.cashier.dto.shop.*;
+import cn.ysk.cashier.mybatis.entity.TbShopOpenId;
+import cn.ysk.cashier.pojo.shop.TbFullShopId;
+import cn.ysk.cashier.service.shop.MsgService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/msg")
+public class MsgController {
+
+
+    private final MsgService msgService;
+
+    public MsgController(MsgService msgService) {
+        this.msgService = msgService;
+    }
+
+    /**
+     * 获取所有订阅消息用户
+     * @return
+     */
+    @AnonymousAccess
+
+    @GetMapping("/all")
+    public ResponseEntity<Page<TbFullShopId>> all(
+            @RequestParam(defaultValue = "1") Integer page,
+            @RequestParam(defaultValue = "10") Integer size,
+            @RequestParam Integer shopId,
+            @RequestParam(required = false) String nickName,
+            @RequestParam(required = false) String openId,
+            @RequestParam(required = false) Integer state,
+            @RequestParam(required = false) Integer type
+    ) {
+        Page<TbFullShopId> all = msgService.all(page, size, shopId, nickName, openId, state, type);
+        return ResponseEntity.ok(all);
+    }
+    @AnonymousAccess
+
+    @PutMapping("/shopState")
+    public ResponseEntity<Boolean> shopMsgState(
+            @Valid @RequestBody ShopMsgStateDTO shopMsgStateDTO
+    ) {
+        return ResponseEntity.of(msgService.updateShopState(shopMsgStateDTO));
+    }
+    @AnonymousAccess
+
+    @DeleteMapping
+    public ResponseEntity<Boolean> removeSubUser(
+            @Valid @RequestBody ShopMsgRemoveDTO shopMsgRemoveDTO
+    ) {
+        return ResponseEntity.of(msgService.removeSubUser(shopMsgRemoveDTO));
+    }
+    @AnonymousAccess
+
+    @PutMapping("/info")
+    public ResponseEntity<Boolean> updateInfo(
+            @Valid @RequestBody ShopInfoUpdateDTO shopInfoUpdateDTO
+    ) {
+        return ResponseEntity.of(msgService.updateInfo(shopInfoUpdateDTO));
+    }
+    @AnonymousAccess
+
+    @GetMapping("/state")
+    public ResponseEntity<HashMap<String, Object>> updateInfo(
+            @RequestParam Integer shopId
+    ) {
+        return ResponseEntity.ok(msgService.getInfo(shopId, null));
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java

@@ -16,10 +16,12 @@
 package cn.ysk.cashier.controller.shop;
 
 import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.dto.shoptable.AddCartDTO;
+import cn.ysk.cashier.dto.shoptable.ClearCartDTO;
+import cn.ysk.cashier.dto.shoptable.RemoveCartDTO;
 import cn.ysk.cashier.pojo.shop.TbShopTable;
 import cn.ysk.cashier.service.shop.TbShopTableService;
 import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria;
-import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -84,4 +86,7 @@ public class TbShopTableController {
         tbShopTableService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-}
+
+
+
+}