zoujiajian hai 1 ano
pai
achega
355fa908db

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

@@ -30,7 +30,7 @@ public class ZfbShopOrderDayLimit extends BaseEntity {
 	/**
 	 * 每小时随机单数 (小时重置)
 	 */
-	private Integer hourRandHourOrders;
+	private Integer hourRandOrders;
 
 	/**
 	 * 每小时限制单数
@@ -50,5 +50,7 @@ public class ZfbShopOrderDayLimit extends BaseEntity {
 	/**
 	 * 限制结束时间
 	 */
-	private Integer endStart;
+	private Integer hourEnd;
+
+	private String remark;
 }

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/pay/impl/AliPayCommonServiceImpl.java

@@ -205,7 +205,7 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 		int hour = DateUtil.hour(DateTime.now(), true);
 		List<ZfbShopOrderDayLimit> orderDayLimits = zfbShopOrderDayLimitMapper.selectList(Wrappers.lambdaQuery(ZfbShopOrderDayLimit.class)
 				.le(ZfbShopOrderDayLimit::getHourStart, hour)
-				.ge(ZfbShopOrderDayLimit::getEndStart, hour)
+				.ge(ZfbShopOrderDayLimit::getHourEnd, hour)
 				.gt(ZfbShopOrderDayLimit::getDayRemainOrders, 0)
 				.gt(ZfbShopOrderDayLimit::getHourLimitOrders, 0));
 		for (ZfbShopOrderDayLimit orderDayLimit : orderDayLimits) {

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

@@ -110,10 +110,11 @@ public class ShopConfigController {
      * 新增支付宝限制单数配置
      */
     @PostMapping("/save/zfb/limit")
-    public Result<String> saveZfbShopOrderDayLimit(ZfbShopOrderDayLimit zfbShopOrderDayLimit) {
-        Integer hourRandHourOrders = zfbShopOrderDayLimit.getHourRandHourOrders();
+    public Result<String> saveZfbShopOrderDayLimit(@RequestBody ZfbShopOrderDayLimit zfbShopOrderDayLimit) {
+        Integer hourRandHourOrders = zfbShopOrderDayLimit.getHourRandOrders();
         zfbShopOrderDayLimit.setHourLimitOrders(RandomUtil.randomInt(hourRandHourOrders) + 1);
         zfbShopOrderDayLimit.setHourRemainOrders(zfbShopOrderDayLimit.getHourLimitOrders());
+        zfbShopOrderDayLimit.setDayRemainOrders(zfbShopOrderDayLimit.getDayLimitOrders());
         zfbShopOrderDayLimitMapper.insert(zfbShopOrderDayLimit);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }