|
@@ -264,32 +264,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
|
264
|
264
|
return responseBean;
|
265
|
265
|
}
|
266
|
266
|
|
267
|
|
- // 3.创建账户消费流水表信息
|
268
|
|
- TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
|
269
|
|
- taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
|
270
|
|
- taOrgAccountDetailedList.setOrgId(orgId);
|
271
|
|
- taOrgAccountDetailedList.setAmount(amount);
|
272
|
|
- taOrgAccountDetailedList.setSignType(1);
|
273
|
|
- taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
|
274
|
|
- taOrgAccountDetailedList.setRemark("线上充值");
|
275
|
|
- taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
|
276
|
|
- taOrgAccountDetailedList.setUserId(userId);
|
277
|
|
- taOrgAccountDetailedList.setUserName(taUser.getUserName());
|
278
|
|
- taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
|
279
|
|
- if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
|
280
|
|
- taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
|
281
|
|
- taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
|
282
|
|
- responseBean.addError("fail");
|
283
|
|
- return responseBean;
|
284
|
|
- }
|
285
|
|
-
|
286
|
|
- // 4.请求微信接口获取支付二维码
|
|
267
|
+ // 3.请求微信接口获取支付二维码
|
287
|
268
|
ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip);
|
288
|
269
|
if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
|
289
|
270
|
return payResult;
|
290
|
271
|
}
|
291
|
272
|
|
292
|
|
- // 5.发送短信
|
|
273
|
+ // 4.发送短信
|
293
|
274
|
ExecutorService threadPool = Executors.newCachedThreadPool();
|
294
|
275
|
threadPool.execute(() -> {
|
295
|
276
|
List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
|
|
@@ -403,30 +384,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
|
403
|
384
|
return responseBean;
|
404
|
385
|
}
|
405
|
386
|
|
406
|
|
- // 6.创建账户消费流水表信息
|
407
|
|
- TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
|
408
|
|
- taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
|
409
|
|
- taOrgAccountDetailedList.setOrgId(orgId);
|
410
|
|
- taOrgAccountDetailedList.setAmount(amount);
|
411
|
|
- taOrgAccountDetailedList.setSignType(-1);
|
412
|
|
- taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
|
413
|
|
- taOrgAccountDetailedList.setRemark("线上申请退款");
|
414
|
|
- taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
|
415
|
|
- taOrgAccountDetailedList.setUserId(userId);
|
416
|
|
- taOrgAccountDetailedList.setUserName(taUser.getUserName());
|
417
|
|
- taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
|
418
|
|
- if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
|
419
|
|
- taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
|
420
|
|
- taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
|
421
|
|
- taOrgAccountBlockedMapper.deleteById(taOrgAccountBlocked.getSerialNo());
|
422
|
|
- responseBean.addError("fail");
|
423
|
|
- return responseBean;
|
424
|
|
- }
|
425
|
|
-
|
426
|
|
- // 7.更新账户新金额
|
|
387
|
+ // 6.更新账户新金额
|
427
|
388
|
taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
|
428
|
389
|
|
429
|
|
- // 8.发送短信
|
|
390
|
+ // 7.发送短信
|
430
|
391
|
ExecutorService threadPool = Executors.newCachedThreadPool();
|
431
|
392
|
threadPool.execute(() -> {
|
432
|
393
|
List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
|