修改bug

ldt-core/src/main/java/org/springblade/gateway/client_gateway/controller/ClientTradeController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.PaymentCache;
 import org.springblade.common.enums.*;
+import org.springblade.common.utils.TradeException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
 import org.springblade.gateway.client_gateway.entity.dto.ClientTradeDto;
@@ -71,7 +72,7 @@ public class ClientTradeController {
 			successParams = trade.tradeForScanPay(order, clientTradeDto.getChannelId());
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new ServiceException(ResCode.TRADE_ERROR);
+			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		}
 		return R.data(successParams);
 	}

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

@@ -153,7 +153,7 @@ public class UserPayCS {
 
 				String openId = shop.getOpenId();
 				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);
+				String contentStr = String.format(MessageTemplate.PAYMENT_NOTICE.getContentString(), bills.getCost(), bills.getPayStatus(), bills.getId(), time);
 				JSONObject content = JSON.parseObject(contentStr);
 				weChatService.sendTemplateMessage(openId, MessageTemplate.PAYMENT_NOTICE, content, configForShop.getPaymentPage(), MiniProgramType.SHOP);
 			}