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

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java

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

@@ -0,0 +1,46 @@
+package cn.ysk.cashier.controller;
+
+import cn.ysk.cashier.dto.TbMiniAppPagesDto;
+import cn.ysk.cashier.mybatis.service.TbMiniAppPagesService;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author GYJ
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/miniAppPages")
+public class TbMiniAppPagesController {
+
+    final private TbMiniAppPagesService tbMiniAppPagesService;
+
+    @PostMapping
+    @ApiOperation("新增/system/miniAppPages")
+    public ResponseEntity<Object> createTbMiniAppPages(@Validated @RequestBody TbMiniAppPagesDto pagesDto) {
+        return tbMiniAppPagesService.createTbMiniAppPages(pagesDto);
+    }
+
+    @PutMapping
+    @ApiOperation("修改/system/miniAppPages")
+    public ResponseEntity<Object> updateTbMiniAppPages(@Validated @RequestBody TbMiniAppPagesDto pagesDto) {
+        return tbMiniAppPagesService.updateTbMiniAppPages(pagesDto);
+    }
+
+    @DeleteMapping("/{pagesId}")
+    @ApiOperation("删除/system/miniAppPages")
+    public ResponseEntity<Object> deleteTbMiniAppPages(@PathVariable Integer pagesId) {
+        return tbMiniAppPagesService.deleteTbMiniAppPages(pagesId);
+    }
+
+    @GetMapping
+    @ApiOperation("查询/system/miniAppPages")
+    public ResponseEntity<Object> getTbMiniAppPages(@RequestParam Map<String, Object> params) {
+        return tbMiniAppPagesService.getTbMiniAppPages(params);
+    }
+}

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

@@ -179,6 +179,16 @@ public class TbPlaceController {
     ) {
         return ResponseEntity.ok(tbShopTableService.pay(payDTO));
     }
+    @AnonymousAccess
+
+    @DeleteMapping("/order")
+    @Log("代客下单 删除订单")
+    @ApiOperation("代客下单 查询购物车 /shop/table")
+    public ResponseEntity<Object> delete(
+            @Validated @RequestBody DeleteOrderDTO deleteOrderDTO
+    ) {
+        return ResponseEntity.ok(tbShopTableService.deleteOrder(deleteOrderDTO));
+    }
 
     @AnonymousAccess
 

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

@@ -0,0 +1,39 @@
+package cn.ysk.cashier.controller.shop;
+
+import cn.ysk.cashier.dto.shop.TbShopAdDto;
+import cn.ysk.cashier.mybatis.service.TbShopAdService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author GYJ
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/ad")
+public class TbShopAdController {
+    final private TbShopAdService tbShopAdService;
+
+    @PostMapping
+    public ResponseEntity<Object> createTbShopAd(@RequestBody TbShopAdDto adDto) {
+        return tbShopAdService.createTbShopAd(adDto);
+    }
+
+    @PutMapping
+    public ResponseEntity<Object> updateTbShopAd(@RequestBody TbShopAdDto adDto) {
+        return tbShopAdService.updateTbShopAd(adDto);
+    }
+
+    @DeleteMapping("/{adId}")
+    public ResponseEntity<Object> deleteTbShopAd(@PathVariable Integer adId) {
+        return tbShopAdService.deleteTbShopAd(adId);
+    }
+
+    @GetMapping
+    public ResponseEntity<Object> getTbShopAd(@RequestParam Map<String, Object> params) {
+        return tbShopAdService.getTbShopAd(params);
+    }
+}

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * @author lyf
@@ -96,4 +97,12 @@ public class TbShopUserController {
     public void rechargeListDownload(HttpServletResponse response, @RequestBody TbShopRechargeListDto criteria) throws IOException {
         tbShopUserService.rechargeListDownload(response, criteria);
     }
+
+
+    @PostMapping("midfiyAccount")
+    @ApiOperation("增加扣减会员余额")
+    public ResponseEntity<Object> midfiyAccount(Map<String,Object> map){
+        tbShopUserService.modfiyAccount(map);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }