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/common/cache/PaymentCache.java

@@ -113,7 +113,6 @@ public class PaymentCache {
 	 */
 	public static SuccessParams getSuccessParams(String billId) {
 		String params =  CacheUtil.get(CacheNames.PAYMENT, ORDER_INFO, billId,String.class,false);
-		redisTemplate.delete(CacheNames.PAYMENT+"::"+ORDER_INFO+billId);
 		return JSON.parseObject(params,SuccessParams.class);
 	}
 

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

@@ -78,15 +78,6 @@ public class PaymentController {
 		return R.success("操作成功");
 	}
 
-	@GetMapping("test")
-	@ApiOperation("test")
-	public R test(){
-		PaymentCache.putSuccessParams("123456", SuccessParams.builder()
-			.orderType(OrderType.USER_PAY.name()).build());
-		SuccessParams successParams = PaymentCache.getSuccessParams("123456");
-		System.out.println(successParams);
-		return R.data(successParams);
-	}
 
 	private Payment pluginBuild(String paymentType){
 		return paymentBuilder.fetchPaymentPlugin(