|
|
@ -154,6 +154,22 @@ public class ConsumeServiceImpl implements ConsumeService { |
|
|
userGoldRecord.setAuditStatus(1); |
|
|
userGoldRecord.setAuditStatus(1); |
|
|
userGoldRecord.setCreateTime(new Date()); |
|
|
userGoldRecord.setCreateTime(new Date()); |
|
|
userGoldRecord.setPayTime(new Date()); |
|
|
userGoldRecord.setPayTime(new Date()); |
|
|
|
|
|
|
|
|
|
|
|
// if(consumeUser.getJwcode().equals(94226013)){ |
|
|
|
|
|
String result= GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, |
|
|
|
|
|
(double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, |
|
|
|
|
|
userGoldRecord.getRemark(), ((double) userGoldRecord.getPermanentGold() / 100), consumeUser.getAdminName(), userGoldRecord.getGoodsName()); |
|
|
|
|
|
//返回状态1加成功2减成功其他失败 -5 金币不足 -6 类型错误 -7签名错误 |
|
|
|
|
|
if(!result.equals("2")){ |
|
|
|
|
|
result= GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, |
|
|
|
|
|
(double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, |
|
|
|
|
|
userGoldRecord.getRemark(), ((double) userGoldRecord.getPermanentGold() / 100), consumeUser.getAdminName(), userGoldRecord.getGoodsName()); |
|
|
|
|
|
//返回状态1加成功2减成功其他失败 -5 金币不足 -6 类型错误 -7签名错误 |
|
|
|
|
|
if(!result.equals("2")){ |
|
|
|
|
|
return Result.error("减金币失败,数据未进erp"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
consumeMapper.add(userGoldRecord); |
|
|
consumeMapper.add(userGoldRecord); |
|
|
consumeMapper.updateUserGold(userGoldRecord); |
|
|
consumeMapper.updateUserGold(userGoldRecord); |
|
|
User user = new User(); |
|
|
User user = new User(); |
|
|
@ -167,10 +183,8 @@ public class ConsumeServiceImpl implements ConsumeService { |
|
|
user.setSumConsumeFree(BigDecimal.valueOf(-consumeUser.getFreeGold().intValue())); |
|
|
user.setSumConsumeFree(BigDecimal.valueOf(-consumeUser.getFreeGold().intValue())); |
|
|
user.setSumConsumeTask(BigDecimal.valueOf(-consumeUser.getTaskGold().intValue())); |
|
|
user.setSumConsumeTask(BigDecimal.valueOf(-consumeUser.getTaskGold().intValue())); |
|
|
userMapper.updateGold(user); |
|
|
userMapper.updateGold(user); |
|
|
// if(consumeUser.getJwcode().equals(94226013)){ |
|
|
|
|
|
GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, |
|
|
|
|
|
(double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, |
|
|
|
|
|
userGoldRecord.getRemark(), ((double) userGoldRecord.getPermanentGold() / 100), consumeUser.getAdminName(), userGoldRecord.getGoodsName()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// } |
|
|
// } |
|
|
return Result.success(); |
|
|
return Result.success(); |
|
|
} |
|
|
} |
|
|
|