From 6927d3bed414fb1a44312668d4e9d91d62e91b3f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2024 00:43:50 +0800
Subject: [PATCH] 口令付款不依赖与订单
---
src/main/java/com/taoke/autopay/controller/client/OrderController.java | 116 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 90 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/client/OrderController.java b/src/main/java/com/taoke/autopay/controller/client/OrderController.java
index be07e1e..a452cc2 100644
--- a/src/main/java/com/taoke/autopay/controller/client/OrderController.java
+++ b/src/main/java/com/taoke/autopay/controller/client/OrderController.java
@@ -13,11 +13,9 @@
import com.taoke.autopay.exception.KeyOrderException;
import com.taoke.autopay.exception.WxOrderCountException;
import com.taoke.autopay.factory.OrderFactory;
-import com.taoke.autopay.service.ClientInfoService;
-import com.taoke.autopay.service.KeyOrderService;
-import com.taoke.autopay.service.WxUserOrderCountService;
-import com.taoke.autopay.service.WxUserSettingService;
+import com.taoke.autopay.service.*;
import com.taoke.autopay.utils.JsonUtil;
+import com.taoke.autopay.utils.MoneyUtil;
import com.taoke.autopay.utils.StringUtil;
import com.taoke.autopay.utils.TimeUtil;
import com.taoke.autopay.utils.order.DYOrderApi;
@@ -55,8 +53,9 @@
// 鍒ゆ柇鏄惁鏄悓涓�澶�
desc = TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss");
out.value(desc);
- } else
+ } else {
out.value("");
+ }
}
@Override
@@ -76,6 +75,9 @@
@Resource
private WxUserSettingService wxUserSettingService;
+
+ @Resource
+ private SystemConfigService systemConfigService;
@ResponseBody
@@ -156,14 +158,14 @@
}
/**
- * @author hxh
+ * @return java.lang.String 杩斿洖鏄惁鍙互鍘绘敮浠�
+ * @author hxh
* @description 璁剧疆璁㈠崟鍙�
* @date 23:08 2024/6/24
* @param: acceptData
* @param: id 璁㈠崟ID
* @param: orderNo 璁㈠崟鍙�
* @param: orderStatus 璁㈠崟鐘舵�侊細璁㈠崟宸插彇娑�/宸叉敮浠�
- * @return java.lang.String 杩斿洖鏄惁鍙互鍘绘敮浠�
**/
@ResponseBody
@RequestMapping("setOrderNo")
@@ -190,7 +192,7 @@
}
try {
- if(!StringUtil.isNullOrEmpty(orderStatus)){
+ if (!StringUtil.isNullOrEmpty(orderStatus)) {
throw new KeyOrderException(orderStatus);
}
DYOrderDto dto = DYOrderApi.getOrderDetail(orderNo);
@@ -203,7 +205,7 @@
orderUpdate.setOrderType(1);
orderUpdate.setOrderNo(orderNo);
if (order.getState() == KeyOrder.STATE_NOT_PROCESS) {
- if (dto.getOrder_status() == DYOrderDto.ORDER_STATUS_CANCELED) {
+ if (dto.getOrder_status() == DYOrderDto.ORDER_STATUS_CANCELED) {
orderUpdate.setState(KeyOrder.STATE_PAY);
orderUpdate.setStateDesc(dto.getOrder_status_desc());
} else {
@@ -219,12 +221,12 @@
}
}
- if(order.getUid()!=null) {
+ if (order.getUid() != null) {
WxUserOrderCount countInfo = wxUserOrderCountService.get(order.getUid(), OrderCountTypeEnum.DY_ORDER_PAY, TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
if (countInfo != null) {
WxUserSettings settings = wxUserSettingService.selectByUid(order.getUid());
- if (settings.getDyOrderCountPerDay()<=countInfo.getOrderCount()){
- throw new Exception("浠婃棩宸茶揪鏀粯娆℃暟涓婇檺锛�"+settings.getDyOrderCountPerDay());
+ if (settings.getDyOrderCountPerDay() <= countInfo.getOrderCount()) {
+ throw new Exception("浠婃棩宸茶揪鏀粯娆℃暟涓婇檺锛�" + settings.getDyOrderCountPerDay());
}
}
}
@@ -235,6 +237,7 @@
orderUpdate.setOrderType(1);
orderUpdate.setOrderState(dto.getOrder_status());
orderUpdate.setOrderNo(orderNo);
+ orderUpdate.setExcutePayTime(new Date());
keyOrderService.update(orderUpdate);
order = keyOrderService.selectById(id);
return JsonUtil.loadTrueResult(gson.toJson(OrderFactory.create(order)));
@@ -245,6 +248,9 @@
orderUpdate.setOrderState(0);
orderUpdate.setOrderNo(orderNo);
orderUpdate.setState(KeyOrder.STATE_REJECT_PAY);
+ if (order.getExcutePayTime() == null) {
+ orderUpdate.setExcutePayTime(new Date());
+ }
orderUpdate.setStateDesc(e.getMessage());
keyOrderService.update(orderUpdate);
return JsonUtil.loadFalseResult(e.getMessage());
@@ -253,6 +259,68 @@
return JsonUtil.loadFalseResult(e.getMessage());
}
}
+
+ @ResponseBody
+ @RequestMapping("setOrderNoV2")
+ public String setOrderNoV2(AcceptData acceptData, String id, String orderNoDesc, String orderStatus, String money) {
+ loggerPay.info("setOrderNo: {}-{}-{}-{}", id, orderNoDesc, orderStatus, money);
+ if (StringUtil.isNullOrEmpty(id)) {
+ return JsonUtil.loadFalseResult("璇蜂笂浼爄d");
+ }
+ if (StringUtil.isNullOrEmpty(money)) {
+ return JsonUtil.loadFalseResult("璇蜂笂浼爉oney");
+ }
+
+ KeyOrder order = keyOrderService.selectById(id);
+ if (order == null) {
+ return JsonUtil.loadFalseResult("鍙ｄ护涓嶅瓨鍦�");
+ }
+
+ try {
+ if (!StringUtil.isNullOrEmpty(orderStatus)) {
+ throw new KeyOrderException(orderStatus);
+ }
+ money = money.replace("楼","");
+ // 鍖归厤閲戦
+ if(!MoneyUtil.getMoneyStr(order.getOrderMoney()).equalsIgnoreCase(money)){
+ throw new KeyOrderException("閲戦涓嶅尮閰�");
+ }
+ if (order.getUid() != null) {
+ WxUserOrderCount countInfo = wxUserOrderCountService.get(order.getUid(), OrderCountTypeEnum.DY_ORDER_PAY, TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
+ if (countInfo != null) {
+ WxUserSettings settings = wxUserSettingService.selectByUid(order.getUid());
+ if (settings.getDyOrderCountPerDay() <= countInfo.getOrderCount()) {
+ throw new Exception("浠婃棩宸茶揪鏀粯娆℃暟涓婇檺锛�" + settings.getDyOrderCountPerDay());
+ }
+ }
+ }
+
+ // 璁剧疆杩涘叆
+ KeyOrder orderUpdate = new KeyOrder();
+ orderUpdate.setId(id);
+ orderUpdate.setOrderType(1);
+ orderUpdate.setExcutePayTime(new Date());
+ keyOrderService.update(orderUpdate);
+ order = keyOrderService.selectById(id);
+ return JsonUtil.loadTrueResult(gson.toJson(OrderFactory.create(order)));
+ } catch (KeyOrderException e) {
+ KeyOrder orderUpdate = new KeyOrder();
+ orderUpdate.setId(id);
+ orderUpdate.setOrderType(1);
+ orderUpdate.setOrderState(0);
+ orderUpdate.setState(KeyOrder.STATE_REJECT_PAY);
+ if (order.getExcutePayTime() == null) {
+ orderUpdate.setExcutePayTime(new Date());
+ }
+ orderUpdate.setStateDesc(e.getMessage());
+ keyOrderService.update(orderUpdate);
+ return JsonUtil.loadFalseResult(e.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return JsonUtil.loadFalseResult(e.getMessage());
+ }
+ }
+
@ResponseBody
@RequestMapping("setPayResult")
@@ -269,7 +337,7 @@
return JsonUtil.loadFalseResult("娌℃湁鍖归厤鍒拌鍗曞彿");
}
- if(order.getState()==KeyOrder.STATE_NOT_PROCESS) {
+ if (order.getState() == KeyOrder.STATE_NOT_PROCESS) {
if (!paySuccess) {
// 鏀粯澶辫触
KeyOrder orderUpdate = new KeyOrder();
@@ -278,12 +346,8 @@
orderUpdate.setStateDesc("鏀粯澶辫触");
keyOrderService.update(orderUpdate);
} else {
- KeyOrder orderUpdate = new KeyOrder();
- orderUpdate.setId(id);
- orderUpdate.setState(KeyOrder.STATE_PAY);
- orderUpdate.setStateDesc("鏀粯鎴愬姛");
try {
- keyOrderService.paySuccess(id,"鏀粯鎴愬姛",TimeUtil.getGernalTime(System.currentTimeMillis(),"yyyyMMdd"));
+ keyOrderService.paySuccess(id, "鏀粯鎴愬姛", TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
} catch (WxOrderCountException e) {
e.printStackTrace();
return JsonUtil.loadFalseResult(e.getMessage());
@@ -322,16 +386,16 @@
@ResponseBody
@RequestMapping("deleteAll")
- public String deleteAll(AcceptData acceptData,Long uid) {
+ public String deleteAll(AcceptData acceptData, Long uid) {
- ClientInfo user= clientInfoService.selectByPrimaryKey(uid);
- if(user==null){
- return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�");
- }
+ ClientInfo user = clientInfoService.selectByPrimaryKey(uid);
+ if (user == null) {
+ return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�");
+ }
- if(user.getRule() != ClientInfo.RULE_ADMIN){
- return JsonUtil.loadFalseResult("鍙湁绠＄悊鍛樻墠鑳藉垹闄�");
- }
+ if (user.getRule() != ClientInfo.RULE_ADMIN) {
+ return JsonUtil.loadFalseResult("鍙湁绠＄悊鍛樻墠鑳藉垹闄�");
+ }
// 鍒犻櫎24灏忔椂涔嬪墠鐨勬暟鎹�
// keyOrderService.deleteAll(new Date(System.currentTimeMillis() - 24*60*60*1000L));
--
Gitblit v1.8.0