|
|
@@ -137,7 +137,8 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
private SeparateAccountsMapper separateAccountsMapper;
|
|
|
@Resource
|
|
|
private DelayedMessageService delayedMessageService;
|
|
|
-
|
|
|
+ @Resource
|
|
|
+ private ShopMoneyMapper shopMoneyMapper;
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@@ -2027,7 +2028,25 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
String s = res == null ? null : res.getString("trade_state");
|
|
|
// String s = "SUCCESS";
|
|
|
if ("SUCCESS".equals(s) || appOrder.getOriginalPrice().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
-
|
|
|
+ ShopMoney shopMoney = shopMoneyMapper.selectOne(Wrappers.<ShopMoney>lambdaQuery()
|
|
|
+ .eq(ShopMoney::getOrgCode, appOrder.getOrgCode())
|
|
|
+ .last("limit 1")
|
|
|
+ .orderByDesc(ShopMoney::getCreateTime));
|
|
|
+ if(null == shopMoney){
|
|
|
+ shopMoney = new ShopMoney()
|
|
|
+ .setBeforeChange(BigDecimal.ZERO)
|
|
|
+ .setAfterChange(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ shopMoneyMapper.insert(new ShopMoney()
|
|
|
+ .setOrgCode(appOrder.getOrgCode())
|
|
|
+ .setIncomeType(2)
|
|
|
+ .setMoneyType(2)
|
|
|
+ .setOrderCode(appOrder.getOrderCode())
|
|
|
+ .setBeforeChange(shopMoney.getAfterChange())
|
|
|
+ .setAfterChange(shopMoney.getAfterChange().add(appOrder.getPrice()))
|
|
|
+ .setMoneyChange(appOrder.getPrice())
|
|
|
+ .setChangeInfo(1)
|
|
|
+ .setCreateTime(new Date()));
|
|
|
if (ObjectUtil.isNotEmpty(appOrder) && Objects.equals(appOrder.getOrderStatus(), CommonConstant.ORDER_STATUS_0)) {
|
|
|
appOrder.setOrderStatus(1);
|
|
|
appOrder.setPayTime(new Date());
|