Merge branch 'master' of http://192.168.1.218:3000/lidexi/guosen-ldt

# Conflicts:
#	src/main/java/org/springblade/common/cache/PaymentCache.java

src/main/java/org/springblade/modules/payment/controller/PaymentController.java

@@ -3,6 +3,7 @@ package org.springblade.modules.payment.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springblade.common.cache.PaymentCache;
+import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.PaymentScene;
 import org.springblade.common.enums.PaymentType;
 import org.springblade.common.enums.ResCode;
@@ -80,7 +81,8 @@ public class PaymentController {
 	@GetMapping("test")
 	@ApiOperation("test")
 	public R test(){
-		PaymentCache.putSuccessParams("123456", SuccessParams.builder().build());
+		PaymentCache.putSuccessParams("123456", SuccessParams.builder()
+			.orderType(OrderType.USER_PAY.name()).build());
 		SuccessParams successParams = PaymentCache.getSuccessParams("123456");
 		System.out.println(successParams);
 		return R.data(successParams);

src/main/java/org/springblade/modules/payment/entity/SuccessParams.java

@@ -1,7 +1,9 @@
 package org.springblade.modules.payment.entity;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author: lianghanqiang
@@ -10,6 +12,8 @@ import lombok.Data;
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SuccessParams {
 
 	public static final String PAY_STATUS_SUCCESS = "success";

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

@@ -143,6 +143,7 @@ public class YeePayPlugin implements Payment {
 				.channel("WECHAT")
 				.scene("OFFLINE")
 				.goodsName(bill.getBillsTitle())
+				.orderId(Convert.toStr(bill.getId()))
 				.orderAmount(Double.valueOf(bill.getPayAmount()))
 				.appId(bill.getAppId())
 				.userId(bill.getOpenId())