From 6af4f709987580678ec4f67b008006cf227b5a46 Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Fri, 21 Apr 2023 13:50:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86,?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A8=E9=80=81=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/pluss/platform/wechat/WxConstants.java | 2 +- .../platform/controller/home/WechantController.java | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java index f818c41..78f4e7c 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java @@ -90,7 +90,7 @@ public class WxConstants { * 微信会员开卡通知模板ID * @date: 2021/12/9 18:17 */ - public static final String VIP_CARD_SUCCESS_TEMPLATE_ID = "AEEmXqtyvSIppWOX-RWglgU8Wc8DxSNDi4xXq7iles0"; + public static final String VIP_CARD_SUCCESS_TEMPLATE_ID = "xCnkmNFUTVmlqn3njTW-qiET6s_6nOVc5k3gb-xW7A0"; /** * 会员卡余额变动通知模板ID diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java index e2b5e12..8593a12 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java @@ -396,29 +396,26 @@ public class WechantController { merchantMenber.setMerchantCode(merchantCode); List queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber); if(queryMerchantMenberList!=null&&queryMerchantMenberList.size()>0) { - System.out.println("queryMerchantMenberList++++++++++++++++++"); merchantMenber = queryMerchantMenberList.get(0); if(StringUtil.isBlank(merchantMenber.getOpenid())){ merchantMenber.setOpenid(openId); if(wxUserInfo != null){ - System.out.println("wxUserInfo++++++++++++++++++"+wxUserInfo); wxUserInfo.buildMember(merchantMenber,null); } merchantMenberService.updateMerchantMenber(merchantMenber); - System.out.println("更新完成++++++++++++++++++++++++++"); try { MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode()); - System.out.println("模板消息++++++++++++++++++++++++++++++"); JSONObject miniprogram = new JSONObject(); miniprogram.put("appid",ParametersUtil.APPLETS_APPID); - miniprogram.put("pagepath","pages/card/index?storeId="+store.getId()+"&phone="+merchantMenber.getPhone()); + miniprogram.put("pagepath","yb_o2ov2/vip/vip-plans?syb_m_id="+store.getId()+"&phone="+merchantMenber.getPhone()); String first = "恭喜您成为本店会员，祝你生活愉快!"; String remark = "如对此卡有疑问或查询会员更多优惠信息，可以点此进入小程序中查看！"; double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableRechargeFee()); double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableGiveFee()); String useFee = BigDecimal.valueOf(usableRechargeFee + usableGiveFee).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString(); - String[] array = {store.getStoreName(),merchantMenber.getPhone(),store.getStoreName()+"会员卡",useFee+"元"}; - WxTemolateRequest tempRequest = new WxTemolateRequest(openId,WxConstants.VIP_CARD_SUCCESS_TEMPLATE_ID,null,null) + String[] array = {store.getStoreName(), merchantMenber.getMemberName(), merchantMenber.getPhone(), new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())}; + //TODO 后面小程序同步后加miniprogram + WxTemolateRequest tempRequest = new WxTemolateRequest(openId,WxConstants.VIP_CARD_SUCCESS_TEMPLATE_ID,null, null) .buildData(first,remark,array); //发送开卡成功消息模板 wxCommonService.sendTemplateMsg(tempRequest,tokenRequest); From 0b76bc417d82e32054d9c2e1ca7c092d14ff1e4d Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Fri, 21 Apr 2023 15:03:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86,?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E8=B4=B9=E7=8E=87=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/pluss/platform/wechat/WxConstants.java | 2 +- .../merchantMenber/impl/MerchantMenberServiceImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java index 78f4e7c..e0ec174 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java @@ -96,5 +96,5 @@ public class WxConstants { * 会员卡余额变动通知模板ID * @date: 2021/12/9 18:19 */ - public static final String VIP_BALANCE_CHANGE_TEMPLATE_ID = "GNwluamISkPhGQU-NC1uBH-ftb7z28rknYe7hZyDKyI"; + public static final String VIP_BALANCE_CHANGE_TEMPLATE_ID = "QNYK59v0h1Q4yQ2lIIrJGE0Fk0JnizhJ-_Gz1cA8_5Q"; } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java index a8f28dd..d1da616 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java @@ -375,9 +375,10 @@ public class MerchantMenberServiceImpl extends ServiceImpl