修改bug

ldt-core/src/main/java/org/springblade/gateway/web_gateway/controller/PressureTestController.java

@@ -1,9 +1,12 @@
 package org.springblade.gateway.web_gateway.controller;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.PaymentCache;
@@ -23,6 +26,10 @@ import org.springblade.payment.event.UserPayEvent;
 import org.springblade.payment.event.UserWithdrawEvent;
 import org.springblade.payment.handle.Trade;
 import org.springblade.payment.handle.entity.Order;
+import org.springblade.wx.config.ConfigForShop;
+import org.springblade.wx.constant.MessageTemplate;
+import org.springblade.wx.constant.MiniProgramType;
+import org.springblade.wx.service.WeChatService;
 import org.springblade.yeePay.common.YeePayConst;
 import org.springblade.yeePay.common.YeepayApiConstant;
 import org.springframework.context.ApplicationEventPublisher;
@@ -53,6 +60,8 @@ public class PressureTestController {
 	private ApplicationEventPublisher eventPublisher;
 	private ILoginUserService loginUserService;
 	private Trade trade;
+	private ConfigForShop configForShop;
+	private WeChatService weChatService;
 
 	@PostMapping("/userBalanceWithdraw")
 	@ApiOperation(value = "用户余额提现（结算）")
@@ -186,4 +195,13 @@ public class PressureTestController {
 		return R.data(successParams);
 	}
 
+	@PostMapping("/sendWXMessage")
+	@ApiModelProperty("测试发送微信收款信息")
+	public void sendWXMessage() {
+		String openId = "ofVsB40EmE24bQP-ZhUV5I5hBB0M";
+		String contentStr = String.format(MessageTemplate.PAYMENT_NOTICE.getContentString(), BigDecimal.valueOf(0.01), "已完结", "1457649143315988481", DateUtil.format(LocalDateTime.now(), "yyyy年MM月dd日 HH:mm:ss"));
+		JSONObject content = JSON.parseObject(contentStr);
+		weChatService.sendTemplateMessage(openId, MessageTemplate.PAYMENT_NOTICE, content, configForShop.getPaymentPage(), MiniProgramType.SHOP);
+	}
+
 }

ldt-core/src/main/java/org/springblade/payment/callback/trade/UserPayCS.java

@@ -1,6 +1,7 @@
 package org.springblade.payment.callback.trade;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -151,7 +152,8 @@ public class UserPayCS {
 				applicationEventPublisher.publishEvent(new BillSuccessEvent(successParams));
 
 				String openId = shop.getOpenId();
-				String contentStr = String.format(String.valueOf(ypSettleAmount), bills.getPayStatus(), bills.getId(), bills.getUpdateTime());
+				String time = DateUtil.format(bills.getUpdateTime(), "yyyy年MM月dd日 HH:mm:ss");
+				String contentStr = String.format(MessageTemplate.PAYMENT_NOTICE.getContentString(), ypSettleAmount, bills.getPayStatus(), bills.getId(), time);
 				JSONObject content = JSON.parseObject(contentStr);
 				weChatService.sendTemplateMessage(openId, MessageTemplate.PAYMENT_NOTICE, content, configForShop.getPaymentPage(), MiniProgramType.SHOP);
 			}

ldt-core/src/main/java/org/springblade/wx/constant/MessageTemplate.java

@@ -31,16 +31,16 @@ public enum MessageTemplate {
 	PAYMENT_NOTICE("2TcoWv042wo8Bf0SLRkjSLG00JAb9bE-usMy_aAW3Js", "" +
 		"{\n" +
 		"    \"amount3\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    },\n" +
 		"    \"phrase1\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    },\n" +
 		"    \"character_string8\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    },\n" +
 		"    \"time4\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    }\n" +
 		"}"),
 	;