|
|
|
@ -149,16 +149,9 @@ public class AuditServiceImpl implements AuditService { |
|
|
|
|
|
|
|
}else if (order.getType()==2) { //退款 |
|
|
|
//对非强制退款订单进行退红包校验 |
|
|
|
if (price== null||linkId== null) |
|
|
|
{ |
|
|
|
String logMsg="旧版订单暂不支持退款,请联系工作人员进行操作"; |
|
|
|
log.error(logMsg); |
|
|
|
AuditContext.setFailMsg(logMsg); |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (order.getAuditStatus()!=4){ |
|
|
|
try { |
|
|
|
redService.checkRed(price, linkId); |
|
|
|
String result = redService.checkRed(price, linkId); |
|
|
|
} catch (RedCheckException e) { |
|
|
|
// 业务失败(flag=false) |
|
|
|
int num = e.getNum(); |
|
|
|
@ -216,9 +209,11 @@ public class AuditServiceImpl implements AuditService { |
|
|
|
GoldTistV2.addCoinNew(order.getJwcode().toString(), 59, //退款任务+永久金币-充值 |
|
|
|
(double) (order.getTaskGold()+order.getPermanentGold() ) /100,SimpleIdGenerator.generateId(), |
|
|
|
order.getRemark(),(double) order.getPermanentGold() / 100, auditName, "退款金币充值");} |
|
|
|
|
|
|
|
//金币退款的原价为充值的永久金币 |
|
|
|
if (order.getRefundType().equals("金币退款")){ |
|
|
|
price= BigDecimal.valueOf(order.getPermanentGold()); |
|
|
|
} |
|
|
|
//额外扣金币抵扣红包 |
|
|
|
|
|
|
|
if (order.getAuditStatus()==4&&price!= null&&linkId!= null){ |
|
|
|
int type = 1; //红包充值累计 |
|
|
|
GoldUser user = userMapper.selectUser(order.getJwcode().toString()); |
|
|
|
|