支付

src/main/java/org/springblade/modules/ldt/agenter/controller/AgenterController.java

@@ -111,11 +111,6 @@ public class AgenterController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入agenter")
 	public R submit(@Valid @RequestBody Agenter agenter) {
-		Assert.notNull(agenter.getUserId(),"代理人的用户信息userId不能为空");
-		//查询该用户是否已经为代理
-		Agenter oldEntity = agenterService.getBaseMapper().selectOne(new QueryWrapper<>(new Agenter()).lambda()
-			.eq(Agenter::getUserId,agenter.getUserId()));
-		Assert.isNull(oldEntity,"该用户已经是代理，请等待审核");
 		return R.status(agenterService.saveOrUpdate(agenter));
 	}
 

src/main/java/org/springblade/modules/ldt/billrecord/controller/BillRecordController.java

@@ -110,7 +110,10 @@ public class BillRecordController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入billRecord")
 	public R submit(@Valid @RequestBody BillRecord billRecord) {
-		return R.status(billRecordService.saveOrUpdate(billRecord));
+		if(billRecordService.saveOrUpdate(billRecord)){
+			return R.data(billRecord.getId());
+		}
+		return R.data(null);
 	}
 
 

src/main/java/org/springblade/modules/ldt/billrecord/entity/BillRecord.java

@@ -87,11 +87,7 @@ public class BillRecord extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "付款方式")
 		private String payWay;
-	/**
-	* 订单id
-	*/
-		@ApiModelProperty(value = "订单id")
-		private String orderId;
+
 	/**
 	* 渠道订单id
 	*/

src/main/java/org/springblade/modules/ldt/billrecord/mapper/BillRecordMapper.xml

@@ -20,7 +20,6 @@
         <result column="unique_order_no" property="uniqueOrderNo"/>
         <result column="channel" property="channel"/>
         <result column="pay_way" property="payWay"/>
-        <result column="order_id" property="orderId"/>
         <result column="channel_order_id" property="channelOrderId"/>
         <result column="pay_amount" property="payAmount"/>
         <result column="third_pay_status" property="thirdPayStatus"/>

src/main/java/org/springblade/modules/payment/plugin/Payment.java

@@ -50,7 +50,7 @@ public interface Payment {
 	 * 	获取订单详情
 	 * */
 	default BillRecord getOrderDetail(PayParam payParam, IBillRecordService billRecordService){
-		return billRecordService.getOne(new QueryWrapper<BillRecord>().lambda().eq(BillRecord::getOrderId, payParam.getOrderId()));
+		return billRecordService.getById(payParam.getOrderId());
 	}
 
 }

src/main/java/org/springblade/modules/payment/plugin/YeePayPlugin.java

@@ -45,7 +45,7 @@ public class YeePayPlugin implements Payment {
 
 		//查询订单状态
 		BillRecord bill = getOrderDetail(payParam,billRecordService);
-		Assert.isNull(bill,"订单查询失败，无此订单信息！");
+		Assert.notNull(bill,"订单查询失败，无此订单信息！");
 
 		//封装回调参数
 		SuccessParams successParams = SuccessParams
@@ -63,7 +63,7 @@ public class YeePayPlugin implements Payment {
 			CreateCodeDto.builder()
 				.amount(Double.valueOf(bill.getPayAmount()))
 				.goodsName(bill.getBillsTitle())
-				.orderId(bill.getOrderId())
+				.orderId(bill.getId().toString())
 				.expiredTime(expireTime)
 				.build());
 	}
@@ -77,7 +77,7 @@ public class YeePayPlugin implements Payment {
 	public R transfer(PayParam payParam) {
 		//查询订单状态
 		BillRecord bill = getOrderDetail(payParam,billRecordService);
-		Assert.isNull(bill,"订单查询失败，无此订单信息！");
+		Assert.notNull(bill,"订单查询失败，无此订单信息！");
 
 		//封装回调参数
 		SuccessParams successParams = SuccessParams