product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1/8

Browse Source
This commit is contained in:
wangpengfei
2024-01-08 21:46:44 +08:00
parent b2da3b5ed2
commit 8552b0c41f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

@@ -1073,7 +1073,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
card.setEndDate(DateUtil.parse("2024-03-31")); card.setEndDate(DateUtil.parse("2024-03-31"));
card.setStartDate(new Date()); card.setStartDate(new Date());
card.setIsSenior("1"); card.setIsSenior("1");
card.setCustomerSid(order.getSid()); card.setCustomerSid(order.getUserSid());
String cardArea = "1"; String cardArea = "1";
String maxSerNum = baseMapper.selctMaxSerNum(cardArea); String maxSerNum = baseMapper.selctMaxSerNum(cardArea);
String uuid = UniqueIdGenerator.generateUniqueID(); String uuid = UniqueIdGenerator.generateUniqueID();

10
src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java
View File

@@ -92,7 +92,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
OrderUrl orderUrl=new OrderUrl(); OrderUrl orderUrl=new OrderUrl();
orderUrl.setPage(""); // orderUrl.setPage(null);
OrderParams orderParams=new OrderParams(); OrderParams orderParams=new OrderParams();
orderParams.setMainSid(""); orderParams.setMainSid("");
orderUrl.setParams(orderParams); orderUrl.setParams(orderParams);
@@ -103,11 +103,15 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
tradeParams.setTrade_no(rb2.get("mainSid").toString()); tradeParams.setTrade_no(rb2.get("mainSid").toString());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);
result.setOrder_url(orderUrl); // result.setOrder_url(orderUrl);
result.setPay_url(payUrl); result.setPay_url(payUrl);
// result result.setTrade_no_url(tradeNoUrl);
result.setBus(new String[0]);
System.out.println(result);
return rb.success().setData(result); return rb.success().setData(result);
} }
private static Map<String, Object> buildMessageBody(String userSid,String openId,String totalTee,String name){ private static Map<String, Object> buildMessageBody(String userSid,String openId,String totalTee,String name){
//拼接base参数 //拼接base参数
Map<String, Object> mp_template_msg = new HashMap<>(); Map<String, Object> mp_template_msg = new HashMap<>();