|
|
@@ -5,10 +5,7 @@ import cn.hutool.json.JSONObject;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.txz.cif.core.Result;
|
|
|
import com.txz.cif.core.ResultGenerator;
|
|
|
-import com.txz.cif.model.BizLog;
|
|
|
-import com.txz.cif.model.Goods;
|
|
|
-import com.txz.cif.model.RechargeRecord;
|
|
|
-import com.txz.cif.model.User;
|
|
|
+import com.txz.cif.model.*;
|
|
|
import com.txz.cif.service.*;
|
|
|
|
|
|
import com.txz.cif.core.ResultCode;
|
|
|
@@ -58,6 +55,8 @@ public class RechargeRecordApiController {
|
|
|
@Resource
|
|
|
private SequenceService sequenceService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private PaymentChannelService paymentChannelService;
|
|
|
|
|
|
@GetMapping("/goodsList")
|
|
|
@ApiOperation(value = "充值商品",httpMethod = "GET")
|
|
|
@@ -88,6 +87,8 @@ public class RechargeRecordApiController {
|
|
|
if (user == null){
|
|
|
return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
|
|
|
}
|
|
|
+ PaymentChannel paymentChannel = paymentChannelService.paymentChannelReturnsByWeight(methodId);
|
|
|
+
|
|
|
// long id = IdUtil.getSnowflake(1, 1).nextId();
|
|
|
String orderNo = sequenceService.genSerialNumber("recharge_rule",null);
|
|
|
RechargeRecord rechargeRecord = RechargeRecord.builder()
|
|
|
@@ -97,6 +98,7 @@ public class RechargeRecordApiController {
|
|
|
.userName(user.getName()).userPhone(user.getPhoneNo())
|
|
|
.bank(user.getBank())
|
|
|
.methodId(methodId)
|
|
|
+ .channelId(paymentChannel == null? null:paymentChannel.getId())
|
|
|
.bankAccount(user.getBankAccount())
|
|
|
.bankAccountName(user.getBankAccountName())
|
|
|
.orderNo(orderNo).goodsId(goodsId)
|
|
|
@@ -105,6 +107,8 @@ public class RechargeRecordApiController {
|
|
|
.build();
|
|
|
rechargeRecordService.save(rechargeRecord);
|
|
|
//TODO 发起第三方支付
|
|
|
+
|
|
|
+
|
|
|
try{
|
|
|
//新增日志
|
|
|
bizLogService.save(BizLog.builder().bizType(1).bizNo(orderNo)
|
