From 8552b0c41fd43f5388e9ee268006102e11ac51e7 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 8 Jan 2024 21:46:44 +0800
Subject: [PATCH] 1/8

---
 .../yxt/yyth/biz/empcardgift/EmpCardGiftService.java   |  2 +-
 .../com/yxt/yyth/biz/ordorder/OrdOrderService.java     | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
index eb73dca..48fe5f1 100644
--- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
@@ -1073,7 +1073,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             card.setEndDate(DateUtil.parse("2024-03-31"));
             card.setStartDate(new Date());
             card.setIsSenior("1");
-            card.setCustomerSid(order.getSid());
+            card.setCustomerSid(order.getUserSid());
             String cardArea = "1";
             String maxSerNum = baseMapper.selctMaxSerNum(cardArea);
             String uuid = UniqueIdGenerator.generateUniqueID();
diff --git a/src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java b/src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java
index 8146d11..30caa9b 100644
--- a/src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java
+++ b/src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java
@@ -92,7 +92,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         payUrl.setParams(aVoid);
 
         OrderUrl orderUrl=new OrderUrl();
-        orderUrl.setPage("");
+//        orderUrl.setPage(null);
         OrderParams orderParams=new OrderParams();
         orderParams.setMainSid("");
         orderUrl.setParams(orderParams);
@@ -103,11 +103,15 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         tradeParams.setTrade_no(rb2.get("mainSid").toString());
         tradeNoUrl.setParams(tradeParams);
 
-        result.setOrder_url(orderUrl);
+//        result.setOrder_url(orderUrl);
         result.setPay_url(payUrl);
-//        result
+        result.setTrade_no_url(tradeNoUrl);
+        result.setBus(new String[0]);
+        System.out.println(result);
         return rb.success().setData(result);
     }
+
+
     private static Map<String, Object> buildMessageBody(String userSid,String openId,String totalTee,String name){
         //拼接base参数
         Map<String, Object> mp_template_msg = new HashMap<>();