From 1a43717440c8d112fc72b6344a5f6a26353ab56e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2024 18:43:29 +0800
Subject: [PATCH] 用户设置除非后台设置，否者不自动添加设置
---
src/main/java/com/taoke/autopay/service/impl/KeyOrderServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/service/impl/KeyOrderServiceImpl.java b/src/main/java/com/taoke/autopay/service/impl/KeyOrderServiceImpl.java
index 2d8b142..1fdc0f8 100644
--- a/src/main/java/com/taoke/autopay/service/impl/KeyOrderServiceImpl.java
+++ b/src/main/java/com/taoke/autopay/service/impl/KeyOrderServiceImpl.java
@@ -12,11 +12,14 @@
import com.taoke.autopay.service.KeyOrderService;
import com.taoke.autopay.service.WxUserOrderCountService;
import com.taoke.autopay.service.WxUserSettingService;
+import com.taoke.autopay.utils.StringUtil;
import com.taoke.autopay.utils.TimeUtil;
+import com.taoke.autopay.vo.SubmitKeyInfo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -45,20 +48,23 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public KeyOrder addKeyOrder(String key, Long uid, String day) throws KeyOrderException, WxOrderCountException {
+ public KeyOrder addKeyOrder(SubmitKeyInfo keyInfo, Long uid, String day) throws KeyOrderException, WxOrderCountException {
// 鍒ゆ柇鎻愪氦娆℃暟鏄惁杩囬噺
if (uid != null) {
- WxUserSettings settings = wxUserSettingService.selectByUid(uid);
+ WxUserSettings settings = wxUserSettingService.getUserSettings(uid);
wxUserOrderCountService.addOrderCount(uid, OrderCountTypeEnum.SUBMIT_TOKEN_COUNT, day, 1, settings.getTotalOrderCountPerDay());
}
- String id = OrderFactory.createId(key);
+ String id = OrderFactory.createId(keyInfo.getKey());
KeyOrder order = keyOrderMapper.selectById(id);
if (order != null) {
throw new KeyOrderException("璇峰嬁閲嶅鎻愪氦鍙ｄ护");
}
order = new KeyOrder();
order.setId(id);
- order.setKey(key);
+ order.setKey(keyInfo.getKey());
+ if(!StringUtil.isNullOrEmpty(keyInfo.getMoney())){
+ order.setOrderMoney(new BigDecimal(keyInfo.getMoney()));
+ }
order.setUid(uid);
order.setState(KeyOrder.STATE_NOT_PROCESS);
order.setStateDesc("灏氭湭澶勭悊");
@@ -139,8 +145,8 @@
@Override
public Long getCanDistributeUid() {
- // 鏈�杩�1灏忔椂鏈夋椿璺�
- List<OrderDistributeCountInfo> list = keyOrderMapper.listDistributeUids(new Date(System.currentTimeMillis() - 1000 * 60 * 60L));
+ // 鏈�杩�1灏忔椂鏈夋椿璺�,涓斾笉绠�12浠ヤ笂鏈墽琛岀殑鏁版嵁
+ List<OrderDistributeCountInfo> list = keyOrderMapper.listDistributeUids(new Date(System.currentTimeMillis() - 1000 * 60 * 60L),new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 12L));
if (list == null || list.size() == 0) {
return null;
}
--
Gitblit v1.8.0