|
@@ -66,13 +66,13 @@ public class ScheduledTask {
|
|
|
|
|
|
private final BaseRedisService baseRedisService;
|
|
|
|
|
|
- @Scheduled(cron = "0 */10 * * * ?")
|
|
|
+// @Scheduled(cron = "0 */10 * * * ?")
|
|
|
public void sendDiscountCouponRemind() {
|
|
|
//查询
|
|
|
|
|
|
}
|
|
|
|
|
|
- @Scheduled(cron = "0 */10 * * * ?")
|
|
|
+// @Scheduled(cron = "0 */10 * * * ?")
|
|
|
// 该方法用于定时更新生活优惠券(LifeCoupon)的状态
|
|
|
public void quanStatusUpdateTask() {
|
|
|
//执行修改代金券状态
|
|
@@ -157,7 +157,7 @@ public class ScheduledTask {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @Scheduled(cron = "0 */10 * * * ?")
|
|
|
+// @Scheduled(cron = "0 */10 * * * ?")
|
|
|
public void orderStatusUpdateTask() {
|
|
|
Date now = new Date();
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
@@ -197,7 +197,7 @@ public class ScheduledTask {
|
|
|
* 自动转账
|
|
|
* 一分钟执行一次
|
|
|
*/
|
|
|
- @Scheduled(cron = "0 */1 * * * ?")
|
|
|
+// @Scheduled(cron = "0 */1 * * * ?")
|
|
|
public void autoTransferAccounts() {
|
|
|
//获取已到账期
|
|
|
LambdaQueryWrapper<StoreIncomeDetailsRecord> wrapper = new LambdaQueryWrapper<>();
|
|
@@ -228,33 +228,36 @@ public class ScheduledTask {
|
|
|
if (money < 10) {
|
|
|
log.info("账户已到账期金额小于最小转账金额, 用户id: {},金额: {}", storeId, money);
|
|
|
} else {
|
|
|
- StoreUser filteredUsers = storeUserList.stream()
|
|
|
+ List<StoreUser> userList = storeUserList.stream()
|
|
|
.filter(storeUser -> storeUser.getStoreId().equals(storeId))
|
|
|
- .collect(Collectors.toList()).get(0);
|
|
|
- StoreAliPayLog pay = aliApi.pay(filteredUsers.getName(), filteredUsers.getIdCard(), filteredUsers.getPhone(), new BigDecimal(money).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
|
|
|
- if (null == pay) {
|
|
|
- log.error("支付宝转账失败, 用户: {},金额: {}", filteredUsers.getPhone(), money);
|
|
|
- } else {
|
|
|
- StoreCashOutRecord storeCashOutRecord = new StoreCashOutRecord();
|
|
|
- //转账记录表
|
|
|
- storeCashOutRecord.setStoreId(storeId)
|
|
|
- .setMoney(money)
|
|
|
- .setCommission(storeCommission.get(storeId))
|
|
|
- .setCashOutType(1)
|
|
|
- .setOrderNo(pay.getOutBizNo())
|
|
|
- .setAliOrderNo(pay.getOrderId())
|
|
|
- .setIncomeStartTime(groupedByStoreId.get(storeId).get(0).getCreatedTime())
|
|
|
- .setIncomeEndTime(groupedByStoreId.get(storeId).get(groupedByStoreId.get(storeId).size() - 1).getCreatedTime())
|
|
|
- .setPaymentDate(new Date());
|
|
|
- storeCashOutRecordService.save(storeCashOutRecord);
|
|
|
- list.forEach(record -> {
|
|
|
- if (record.getStoreId().equals(storeId)) {
|
|
|
- record.setCashOutId(storeCashOutRecord.getId());
|
|
|
- }
|
|
|
- });
|
|
|
- //减少金额
|
|
|
- filteredUsers.setMoney(filteredUsers.getMoney() - money);
|
|
|
- storeUserService.updateById(filteredUsers);
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ if (!userList.isEmpty()) {
|
|
|
+ StoreUser filteredUsers = userList.get(0);
|
|
|
+ StoreAliPayLog pay = aliApi.pay(filteredUsers.getName(), filteredUsers.getIdCard(), filteredUsers.getPhone(), new BigDecimal(money).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
|
|
|
+ if (null == pay) {
|
|
|
+ log.error("支付宝转账失败, 用户: {},金额: {}", filteredUsers.getPhone(), money);
|
|
|
+ } else {
|
|
|
+ StoreCashOutRecord storeCashOutRecord = new StoreCashOutRecord();
|
|
|
+ //转账记录表
|
|
|
+ storeCashOutRecord.setStoreId(storeId)
|
|
|
+ .setMoney(money)
|
|
|
+ .setCommission(storeCommission.get(storeId))
|
|
|
+ .setCashOutType(1)
|
|
|
+ .setOrderNo(pay.getOutBizNo())
|
|
|
+ .setAliOrderNo(pay.getOrderId())
|
|
|
+ .setIncomeStartTime(groupedByStoreId.get(storeId).get(0).getCreatedTime())
|
|
|
+ .setIncomeEndTime(groupedByStoreId.get(storeId).get(groupedByStoreId.get(storeId).size() - 1).getCreatedTime())
|
|
|
+ .setPaymentDate(new Date());
|
|
|
+ storeCashOutRecordService.save(storeCashOutRecord);
|
|
|
+ list.forEach(record -> {
|
|
|
+ if (record.getStoreId().equals(storeId)) {
|
|
|
+ record.setCashOutId(storeCashOutRecord.getId());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ //减少金额
|
|
|
+ filteredUsers.setMoney(filteredUsers.getMoney() - money);
|
|
|
+ storeUserService.updateById(filteredUsers);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -265,7 +268,7 @@ public class ScheduledTask {
|
|
|
/**
|
|
|
* 反向团购订单自动退款
|
|
|
*/
|
|
|
- @Scheduled(cron = "0 * * * * ?")
|
|
|
+// @Scheduled(cron = "0 * * * * ?")
|
|
|
public void reverseGroupOrder() {
|
|
|
LambdaQueryWrapper<LifeReverseGroupBuying> wrapper = new LambdaQueryWrapper<>();
|
|
|
//状态, 0:待审核, 1:未通过, 2:已通过, 3:待接单, 4:未接单(已截止), 5:待使用, 6:已完成, 7:已退款
|
|
@@ -284,7 +287,7 @@ public class ScheduledTask {
|
|
|
LifeUser lifeUser = lifeUserService.getById(lifeUserOrder.getUserId());
|
|
|
LifeMessage lifeMessage = new LifeMessage();
|
|
|
lifeMessage.setSenderName("system");
|
|
|
- if (lifeUser != null){
|
|
|
+ if (lifeUser != null) {
|
|
|
lifeMessage.setReceiverId("user_" + lifeUser.getUserPhone());
|
|
|
lifeMessage.setContent("你有一笔反向团购退款失败, 请联系管理员");
|
|
|
lifeMessage.setType("2");
|