|
|
|
@ -7,6 +7,7 @@ import com.example.demo.domain.vo.coin.ConsumeUser; |
|
|
|
import com.example.demo.domain.vo.coin.Gold; |
|
|
|
import com.example.demo.domain.vo.coin.GoldUser; |
|
|
|
import com.example.demo.domain.vo.coin.Result; |
|
|
|
import com.example.demo.exception.SystemException; |
|
|
|
import com.example.demo.mapper.coin.ConsumeMapper; |
|
|
|
import com.example.demo.mapper.coin.MarketMapper; |
|
|
|
import com.example.demo.mapper.coin.UserMapper; |
|
|
|
@ -158,7 +159,7 @@ public class ConsumeServiceImpl implements ConsumeService { |
|
|
|
|
|
|
|
// if(consumeUser.getJwcode().equals(94226013)){ |
|
|
|
String result= GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, |
|
|
|
(double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, |
|
|
|
(double) 100 * (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, |
|
|
|
userGoldRecord.getRemark(),0, consumeUser.getAdminName(), userGoldRecord.getGoodsName()); |
|
|
|
// System.out.println("9"+result+"9"); |
|
|
|
result = result.replaceAll("[\r\n]", ""); |
|
|
|
@ -166,12 +167,13 @@ public class ConsumeServiceImpl implements ConsumeService { |
|
|
|
//返回状态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, |
|
|
|
(double) 100 * (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, |
|
|
|
userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName()); |
|
|
|
//返回状态1加成功2减成功其他失败 -5 金币不足 -6 类型错误 -7签名错误 |
|
|
|
if(!result.equals("2")){ |
|
|
|
String errorMsg = "减金币失败,数据未进erp,返回状态:" + result; |
|
|
|
log.error("减金币失败,数据未进erp,返回状态:" + result); |
|
|
|
return Result.error("减金币失败,数据未进erp"); |
|
|
|
throw new SystemException(errorMsg); // 抛出系统异常,中断流程并传递错误信息 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|