|
|
@ -10,16 +10,19 @@ import com.example.demo.domain.vo.coin.RefundAudit; |
|
|
import com.example.demo.mapper.coin.AuditMapper; |
|
|
import com.example.demo.mapper.coin.AuditMapper; |
|
|
import com.example.demo.mapper.coin.MarketMapper; |
|
|
import com.example.demo.mapper.coin.MarketMapper; |
|
|
import com.example.demo.mapper.coin.UserMapper; |
|
|
import com.example.demo.mapper.coin.UserMapper; |
|
|
|
|
|
import com.example.demo.service.Temporary.RedService; |
|
|
import com.example.demo.service.coin.AdminService; |
|
|
import com.example.demo.service.coin.AdminService; |
|
|
import com.example.demo.service.coin.AuditService; |
|
|
import com.example.demo.service.coin.AuditService; |
|
|
import com.example.demo.service.coin.GeneralService; |
|
|
import com.example.demo.service.coin.GeneralService; |
|
|
import com.github.pagehelper.PageHelper; |
|
|
import com.github.pagehelper.PageHelper; |
|
|
import com.github.pagehelper.PageInfo; |
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
import java.math.BigDecimal; |
|
|
|
|
|
import java.math.RoundingMode; |
|
|
import java.util.Calendar; |
|
|
import java.util.Calendar; |
|
|
import java.util.Date; |
|
|
import java.util.Date; |
|
|
import java.util.GregorianCalendar; |
|
|
import java.util.GregorianCalendar; |
|
|
@ -35,6 +38,7 @@ import java.util.List; |
|
|
**/ |
|
|
**/ |
|
|
|
|
|
|
|
|
@Service |
|
|
@Service |
|
|
|
|
|
@Slf4j |
|
|
public class AuditServiceImpl implements AuditService { |
|
|
public class AuditServiceImpl implements AuditService { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private AuditMapper auditMapper; |
|
|
private AuditMapper auditMapper; |
|
|
@ -46,6 +50,8 @@ public class AuditServiceImpl implements AuditService { |
|
|
private GeneralService generalService; |
|
|
private GeneralService generalService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private MarketMapper marketMapper; |
|
|
private MarketMapper marketMapper; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private RedService redService; |
|
|
/* |
|
|
/* |
|
|
审核订单并修改用户余额等 |
|
|
审核订单并修改用户余额等 |
|
|
*/ |
|
|
*/ |
|
|
@ -111,15 +117,29 @@ public class AuditServiceImpl implements AuditService { |
|
|
auditMapper.updateFirstRecharge(order.getJwcode());//设置首充时间为当前时间 |
|
|
auditMapper.updateFirstRecharge(order.getJwcode());//设置首充时间为当前时间 |
|
|
} |
|
|
} |
|
|
auditMapper.updateUserGold(update); |
|
|
auditMapper.updateUserGold(update); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//累充 |
|
|
|
|
|
try { |
|
|
|
|
|
BigDecimal sum = BigDecimal.valueOf( |
|
|
|
|
|
order.getPermanentGold() + order.getFreeJune() + order.getFreeDecember() |
|
|
|
|
|
).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); |
|
|
|
|
|
|
|
|
|
|
|
redService.addAmount(order.getJwcode(), sum, 1); // ← 直接调你写好的方法! |
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
log.warn("红包累加失败,主流程继续 | jwcode={}", order.getJwcode(), e); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//erp增加充值数据 |
|
|
//erp增加充值数据 |
|
|
// if(update.getJwcode().equals(94226013)){ |
|
|
|
|
|
|
|
|
|
|
|
GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币 |
|
|
GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币 |
|
|
(double) (order.getPermanentGold() ) /100, |
|
|
(double) (order.getPermanentGold() ) /100, |
|
|
order.getRemark(),(double) (order.getPermanentGold() ) /100, auditName, "金币充值"); |
|
|
order.getRemark(),(double) (order.getPermanentGold() ) /100, auditName, "金币充值"); |
|
|
GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费 |
|
|
GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费 |
|
|
(double) (order.getFreeDecember()+order.getFreeJune() ) /100, |
|
|
(double) (order.getFreeDecember()+order.getFreeJune() ) /100, |
|
|
order.getRemark(),0, auditName, "金币充值"); |
|
|
order.getRemark(),0, auditName, "金币充值"); |
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
}else if (order.getType()==2) { //退款 |
|
|
}else if (order.getType()==2) { //退款 |
|
|
//2.获取对应的订单(退款订单号去掉开头"TK"即为对应原始订单) |
|
|
//2.获取对应的订单(退款订单号去掉开头"TK"即为对应原始订单) |
|
|
String oldOrderCode = order.getOrderCode().replaceFirst("TK_", ""); |
|
|
String oldOrderCode = order.getOrderCode().replaceFirst("TK_", ""); |
|
|
|