fix

netflix-dao/src/main/java/com/cyksj/model/entity/ZfbShopOrderDayLimit.java

@@ -12,17 +12,43 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ZfbShopOrderDayLimit extends BaseEntity {
+	/**
+	 * 支付宝appid
+	 */
 	private String appId;
 
+	/**
+	 * 每日限制单数
+	 */
 	private Integer dayLimitOrders;
 
+	/**
+	 * 每日剩余可支付单数
+	 */
 	private Integer dayRemainOrders;
 
+	/**
+	 * 每小时随机单数 （小时重置）
+	 */
+	private Integer hourRandHourOrders;
+
+	/**
+	 * 每小时限制单数
+	 */
 	private Integer hourLimitOrders;
 
+	/**
+	 * 每小时剩余可支付单数
+	 */
 	private Integer hourRemainOrders;
 
+	/**
+	 * 限制开始时间
+	 */
 	private Integer hourStart;
 
+	/**
+	 * 限制结束时间
+	 */
 	private Integer endStart;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/shop/ShopConfigController.java

@@ -1,12 +1,15 @@
 package com.cyksj.web.controller.manage.shop;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.ZfbShopOrderDayLimitMapper;
 import com.cyksj.model.entity.Channel;
 import com.cyksj.model.entity.ShopConfig;
+import com.cyksj.model.entity.ZfbShopOrderDayLimit;
 import com.cyksj.model.request.ChannelPayReq;
 import com.cyksj.service.mange.channel.ChannelService;
 import com.cyksj.service.mange.shop.ShopConfigService;
@@ -18,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @author chan
@@ -37,6 +41,8 @@ public class ShopConfigController {
 
     private final ChannelService channelService;
 
+    private final ZfbShopOrderDayLimitMapper zfbShopOrderDayLimitMapper;
+
     @GetMapping
     @SaCheckPermission("merchant:view")
     public Result<SearchResult<ShopConfig>> get(){
@@ -85,5 +91,40 @@ public class ShopConfigController {
     /**
      * 支付宝每日限单数 配置列表
      */
+    @GetMapping("/get/zfb/limit")
+    public Result<List<ZfbShopOrderDayLimit>> getZfbShopOrderDayLimit() {
+        List<ZfbShopOrderDayLimit> orderDayLimits = beanSearcher.searchAll(ZfbShopOrderDayLimit.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(orderDayLimits);
+    }
 
+    /**
+     * 编辑支付宝限制单数配置
+     */
+    @PutMapping("/update/zfb/limit")
+    public Result<String> updateZfbShopOrderDayLimit(ZfbShopOrderDayLimit zfbShopOrderDayLimit) {
+        zfbShopOrderDayLimitMapper.updateById(zfbShopOrderDayLimit);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
+    /**
+     * 新增支付宝限制单数配置
+     */
+    @PostMapping("/save/zfb/limit")
+    public Result<String> saveZfbShopOrderDayLimit(ZfbShopOrderDayLimit zfbShopOrderDayLimit) {
+        Integer hourRandHourOrders = zfbShopOrderDayLimit.getHourRandHourOrders();
+        zfbShopOrderDayLimit.setHourLimitOrders(RandomUtil.randomInt(hourRandHourOrders) + 1);
+        zfbShopOrderDayLimit.setHourRemainOrders(zfbShopOrderDayLimit.getHourLimitOrders());
+        zfbShopOrderDayLimitMapper.insert(zfbShopOrderDayLimit);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
+
+    /**
+     * 新增支付宝限制单数配置
+     */
+    @DeleteMapping("/delete/zfb/limit/{id}")
+    public Result<String> saveZfbShopOrderDayLimit(@PathVariable Long id) {
+        zfbShopOrderDayLimitMapper.deleteById(id);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
 }