|
|
|
@ -161,15 +161,15 @@ public class ConsumeServiceImpl implements ConsumeService { |
|
|
|
(double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, |
|
|
|
userGoldRecord.getRemark(), ((double) userGoldRecord.getPermanentGold() / 100), consumeUser.getAdminName(), userGoldRecord.getGoodsName()); |
|
|
|
// System.out.println("9"+result+"9"); |
|
|
|
|
|
|
|
result = result.replaceAll("[\r\n]", ""); |
|
|
|
|
|
|
|
//返回状态1加成功2减成功其他失败 -5 金币不足 -6 类型错误 -7签名错误 |
|
|
|
if(!result.equals("2\r\n")){ |
|
|
|
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\r\n")){ |
|
|
|
if(!result.equals("2")){ |
|
|
|
log.error("减金币失败,数据未进erp,返回状态:" + result); |
|
|
|
return Result.error("减金币失败,数据未进erp"); |
|
|
|
} |
|
|
|
|