From 4fef1d526ca20ed01937846431c6a5799ea0030c Mon Sep 17 00:00:00 2001
From: hu177768073 <177768073@qq.com>
Date: Mon, 10 Feb 2025 09:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/hfkj/common/pay/util/SignatureUtil.java | 13 +++++--------
.../main/java/com/hfkj/dao/BsGasOrderMapperExt.java | 5 +++++
.../com/hfkj/service/gas/BsGasOrderService.java | 7 ++++++-
.../service/gas/impl/BsGasOrderServiceImpl.java | 5 +++++
.../com/hfkj/service/order/OrderCreateService.java | 7 +++++++
5 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/service/src/main/java/com/hfkj/common/pay/util/SignatureUtil.java b/service/src/main/java/com/hfkj/common/pay/util/SignatureUtil.java
index 01f5703..08ca98c 100644
--- a/service/src/main/java/com/hfkj/common/pay/util/SignatureUtil.java
+++ b/service/src/main/java/com/hfkj/common/pay/util/SignatureUtil.java
@@ -85,14 +85,11 @@ public class SignatureUtil {
}
public static void main(String[] args) throws Exception {
- String paramStr = "{ \n" +
- " \"reqId\": \"cs0008\",\n" +
- " \"appId\": \"hf7356c71fb97ab0\",\n" +
- " \"discountPkNo\": \"DPK10018\",\n" +
- " \"number\": \"1\",\n" +
- " \"phone\": \"17726395120\"\n" +
- "}";
- String sign = createSign(JSONObject.parseObject(paramStr), "8aef995ff71485dc19b36e35f04c4016");
+ JSONObject obj = new JSONObject();
+ obj.put("appid", "hfc030e3c3217dfc");
+ obj.put("phone", "18328378446");
+
+ String sign = createSign(JSONObject.parseObject(obj.toJSONString()), "8518b90a06b4ac67fd2ff8d8ae4c2d62");
System.out.println(sign);
}
diff --git a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java
index 994b5c4..609f4f0 100644
--- a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java
+++ b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java
@@ -48,4 +48,9 @@ public interface BsGasOrderMapperExt {
" " +
"")
Map selectGasOrderCount(@Param("param") Map param);
+
+ @Select("")
+ int countTodayOrder(@Param("userPhone") String userPhone);
}
diff --git a/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java b/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java
index 242934b..fff9cb3 100644
--- a/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java
+++ b/service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java
@@ -73,5 +73,10 @@ public interface BsGasOrderService {
*/
List getGasOrderList(Map param);
-
+ /**
+ * 统计今日订单数量
+ * @param userPhone
+ * @return
+ */
+ int countTodayOrder(String userPhone);
}
diff --git a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java
index 8f113be..d3977b1 100644
--- a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java
@@ -272,4 +272,9 @@ public class BsGasOrderServiceImpl implements BsGasOrderService {
example.setOrderByClause("create_time desc");
return gasOrderMapper.selectByExample(example);
}
+
+ @Override
+ public int countTodayOrder(String userPhone) {
+ return gasOrderMapper.countTodayOrder(userPhone);
+ }
}
diff --git a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java
index 96ce243..793e408 100644
--- a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java
+++ b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java
@@ -81,11 +81,18 @@ public class OrderCreateService {
}
}
}
+ // 下单数量限制
+ int createOrderLimit = Integer.parseInt(secDictionaryService.getDictionary("GAS_ORDER_CREATE_LIMIT").get(0).getCodeValue());
+ if (gasOrderService.countTodayOrder(order.getUserPhone()) >= createOrderLimit) {
+ throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "加油订单每日下单限制"+createOrderLimit+"笔");
+ }
+
if (orderDeduction != null && orderDeduction.getUserCouponDiscountId() != null) {
if (discountUseMerService.getDetail(orderDeduction.getCouponDiscountNo(), orderChild.getMerNo()) == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "油站不支持该优惠券使用");
}
}
+
// 查询油站
BsMerchant merchant = merchantService.getMerchant(orderChild.getMerNo());
if (merchant == null) {