店铺配置

店铺装修

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

@@ -1,92 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package cn.ysk.cashier.controller.shop;
-
-import cn.ysk.cashier.annotation.Log;
-import cn.ysk.cashier.dto.shop.TbMerchantCouponDto;
-import cn.ysk.cashier.pojo.shop.TbMerchantCoupon;
-import cn.ysk.cashier.pojo.shop.TbPurchaseNotice;
-import cn.ysk.cashier.repository.shop.TbPurchaseNoticeRepository;
-import cn.ysk.cashier.service.shop.TbMerchantCouponService;
-import cn.ysk.cashier.dto.shop.TbMerchantCouponQueryCriteria;
-import cn.ysk.cashier.service.shop.TbPurchaseNoticeService;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://eladmin.vip
-* @author lyf
-* @date 2024-03-20
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "/shop/coupon管理")
-@RequestMapping("/api/tbMerchantCoupon")
-public class TbMerchantCouponController {
-
-    private final TbMerchantCouponService tbMerchantCouponService;
-    private final TbPurchaseNoticeRepository noticeRepository;
-
-    @ApiOperation("导出数据")
-    public void exportTbMerchantCoupon(HttpServletResponse response, TbMerchantCouponQueryCriteria criteria) throws IOException {
-        tbMerchantCouponService.download(tbMerchantCouponService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    public ResponseEntity<Object> queryTbMerchantCoupon(TbMerchantCouponQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(tbMerchantCouponService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @GetMapping("/{id}")
-    @ApiOperation("查询优惠卷")
-    public ResponseEntity<Object> queryTbMerchantCouponById(@PathVariable("id")Integer id){
-        Map result=new HashMap<>();
-        TbMerchantCouponDto coupon = tbMerchantCouponService.findById(id);
-        result.put("coupon",coupon);
-        TbPurchaseNotice notice = noticeRepository.findByCouponId(id);
-        result.put("notice",notice);
-        return new ResponseEntity<>(result,HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增商家优惠卷:#resources.title")
-    public ResponseEntity<Object> createTbMerchantCoupon(@Validated @RequestBody TbMerchantCoupon resources){
-        return new ResponseEntity<>(tbMerchantCouponService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改商家优惠卷:#resources.title")
-    public ResponseEntity<Object> updateTbMerchantCoupon(@Validated @RequestBody TbMerchantCoupon resources){
-        tbMerchantCouponService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @DeleteMapping
-    @Log("删除商家优惠卷:#ids")
-    public ResponseEntity<Object> deleteTbMerchantCoupon(@RequestBody Integer[] ids) {
-        tbMerchantCouponService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java

@@ -199,4 +199,7 @@ public class TbShopInfoDto implements Serializable {
     //程序码(零点八零首页)
     private String smallQrcode;
     private String paymentQrcode;
+
+    private Integer isMemberPrice;
+    private String consumeColony;
 }

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopExtend.java

@@ -150,6 +150,12 @@ public class TbShopExtend extends Model<TbShopExtend> {
                     this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png";
                     this.title = "商品列表";
                     break;
+                case "ticket_logo":
+                    this.name = "小票logo图";
+                    this.detail="建议尺寸: 417*139";
+                    this.value = "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20241022/eeee8e85c66947e5bcaebf687381b5d6.png";
+                    this.title = "小票logo";
+                    break;
             }
         }
         this.type="img";

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopExtendServiceImpl.java

@@ -86,7 +86,7 @@ public class TbShopExtendServiceImpl extends ServiceImpl<TbShopExtendMapper, TbS
 
     public Page<TbShopExtend> checkAndInitialize(Page<TbShopExtend> ipage, Integer shopId) {
         List<TbShopExtend> newRecords = new ArrayList<>();
-        List<String> requiredAutokeys = Arrays.asList("index_bg", "my_bg", "member_bg", "shopinfo_bg");
+        List<String> requiredAutokeys = Arrays.asList("index_bg", "my_bg", "member_bg", "shopinfo_bg","ticket_logo");
 
         if (ipage == null || ipage.getRecords() == null || ipage.getRecords().isEmpty()) {
             // ipage 为空，直接创建包含四种类型数据的新 Page 对象
@@ -114,6 +114,9 @@ public class TbShopExtendServiceImpl extends ServiceImpl<TbShopExtendMapper, TbS
                     case "shopinfo_bg":
                         shopExtend.setTitle("商品列表");
                         break;
+                    case "ticket_logo":
+                        shopExtend.setTitle("小票logo");
+                        break;
                 }
             }
             Set<String> existingAutokeys = shopExtends.stream()

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java

@@ -260,6 +260,14 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "是否允许用户自定义金额")
     private String isMemberReturn;
 
+    @Column(name = "is_member_price")
+    @ApiModelProperty(value = "是否启用会员价 0否1是")
+    private Integer isMemberPrice;
+
+    @Column(name = "consume_colony")
+    @ApiModelProperty(value = "积分群体 all-所有 vip-仅针对会员")
+    private String consumeColony;
+
     @Column(name = "is_table_fee")
     @ApiModelProperty(value = "是否免除桌位费 0否1是")
     private Integer isTableFee;