From a666db70b9a0eb8f500eb107f8541b7336e8a741 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 1 Jun 2022 17:18:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hai/service/impl/HltUnionCardVipServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java index e7f4e724..5c47812b 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java @@ -199,7 +199,7 @@ public class HltUnionCardVipServiceImpl implements HltUnionCardVipService { if (equityLevel == 1) { HuiLianTongUnionCardConfig.submitSms(phone , "“E信通会员专属”3张4元话费券、2张99折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); } else { - HuiLianTongUnionCardConfig.submitSms(phone , "“工会卡用户专属”2元话费券、2张99折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); + HuiLianTongUnionCardConfig.submitSms(phone , "“5张98折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); } } From 71e054dc8dea5dbbd34bacdd0cec71be542b31c9 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 1 Jun 2022 17:36:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hai/service/impl/HltUnionCardVipServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java index 5c47812b..64177692 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java @@ -199,7 +199,8 @@ public class HltUnionCardVipServiceImpl implements HltUnionCardVipService { if (equityLevel == 1) { HuiLianTongUnionCardConfig.submitSms(phone , "“E信通会员专属”3张4元话费券、2张99折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); } else { - HuiLianTongUnionCardConfig.submitSms(phone , "“5张98折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); + + HuiLianTongUnionCardConfig.submitSms(phone , "“工会卡用户专属”2元话费券、5张98折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。"); } } From 8a5ffaad8059f1426505092d7ab4b4085e2df915 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 1 Jun 2022 17:48:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cweb/controller/pay/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java index 437debc3..6eb41fb2 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java @@ -263,7 +263,7 @@ public class OrderController { SortedMap sortedMap = wechatPayUtil.goWechatPay(weChatPayReqInfo,payMap); order.setProfitSharingRatio(profitSharingRatio); - order.setProfitSharingStatus(profitSharing.equals("y")?true:false); + order.setProfitSharingStatus(profitSharing.equals("Y")?true:false); order.setAccountMerchantNum(weChatPayReqInfo.getSub_mch_id()); order.setExt1(weChatPayReqInfo.getSub_appid()); highOrderService.updateOrderDetail(order);