czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui

Browse Source
This commit is contained in:
zhujunshuai
2023-04-24 10:55:47 +08:00
parent c095746fba 0b76bc417d
commit 3e7655cd96
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java
View File

@@ -90,11 +90,11 @@ public class WxConstants {
* 微信会员开卡通知模板ID * 微信会员开卡通知模板ID
* @date: 2021/12/9 18:17 * @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 * 会员卡余额变动通知模板ID
* @date: 2021/12/9 18:19 * @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";
} }

5
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java
View File

@@ -375,9 +375,10 @@ public class MerchantMenberServiceImpl extends ServiceImpl<MerchantMenberMapper,
String remark = "如对此会员卡余额变动有疑问，可以点此进入小程序中查看！"; String remark = "如对此会员卡余额变动有疑问，可以点此进入小程序中查看！";
String transTitle = "1".equals(type) ? "会员充值" : "2".equals(type) ? "会员消费" :"现金充值"; String transTitle = "1".equals(type) ? "会员充值" : "2".equals(type) ? "会员消费" :"现金充值";
String useFee = BigDecimal.valueOf(menber.getUsableRechargeFee() + menber.getUsableGiveFee()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString(); String useFee = BigDecimal.valueOf(menber.getUsableRechargeFee() + menber.getUsableGiveFee()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString();
String[] array = {transTitle,amt.toString(), DateUtils.toString(new Date(),"yyyy-MM-dd HH:mm:ss"),useFee}; String[] array = {menber.getMemberCode(),amt.toString(), DateUtils.toString(new Date(),"yyyy-MM-dd HH:mm:ss"),transTitle, useFee};
WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, null, WxConstants.ACCESS_TOKEN_URL); WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, null, WxConstants.ACCESS_TOKEN_URL);
WxTemolateRequest temolateRequest = new WxTemolateRequest(menber.getOpenid(),WxConstants.VIP_BALANCE_CHANGE_TEMPLATE_ID,null,miniprogram) //TODO miniprogram后续小程序调整好后再接
WxTemolateRequest temolateRequest = new WxTemolateRequest(menber.getOpenid(),WxConstants.VIP_BALANCE_CHANGE_TEMPLATE_ID,null,null)
.buildData(first,remark,array); .buildData(first,remark,array);
wxCommonService.sendTemplateMsg(temolateRequest,request); wxCommonService.sendTemplateMsg(temolateRequest,request);
} }

11
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java
View File

@@ -396,29 +396,26 @@ public class WechantController {
merchantMenber.setMerchantCode(merchantCode); merchantMenber.setMerchantCode(merchantCode);
List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber); List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
if(queryMerchantMenberList!=null&&queryMerchantMenberList.size()>0) { if(queryMerchantMenberList!=null&&queryMerchantMenberList.size()>0) {
System.out.println("queryMerchantMenberList++++++++++++++++++");
merchantMenber = queryMerchantMenberList.get(0); merchantMenber = queryMerchantMenberList.get(0);
if(StringUtil.isBlank(merchantMenber.getOpenid())){ if(StringUtil.isBlank(merchantMenber.getOpenid())){
merchantMenber.setOpenid(openId); merchantMenber.setOpenid(openId);
if(wxUserInfo != null){ if(wxUserInfo != null){
System.out.println("wxUserInfo++++++++++++++++++"+wxUserInfo);
wxUserInfo.buildMember(merchantMenber,null); wxUserInfo.buildMember(merchantMenber,null);
} }
merchantMenberService.updateMerchantMenber(merchantMenber); merchantMenberService.updateMerchantMenber(merchantMenber);
System.out.println("更新完成++++++++++++++++++++++++++");
try { try {
MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode()); MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode());
System.out.println("模板消息++++++++++++++++++++++++++++++");
JSONObject miniprogram = new JSONObject(); JSONObject miniprogram = new JSONObject();
miniprogram.put("appid",ParametersUtil.APPLETS_APPID); 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 first = "恭喜您成为本店会员，祝你生活愉快!";
String remark = "如对此卡有疑问或查询会员更多优惠信息，可以点此进入小程序中查看！"; String remark = "如对此卡有疑问或查询会员更多优惠信息，可以点此进入小程序中查看！";
double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableRechargeFee()); double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableRechargeFee());
double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableGiveFee()); double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableGiveFee());
String useFee = BigDecimal.valueOf(usableRechargeFee + usableGiveFee).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString(); String useFee = BigDecimal.valueOf(usableRechargeFee + usableGiveFee).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString();
String[] array = {store.getStoreName(),merchantMenber.getPhone(),store.getStoreName()+"会员卡",useFee+"元"}; String[] array = {store.getStoreName(), merchantMenber.getMemberName(), merchantMenber.getPhone(), new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())};
WxTemolateRequest tempRequest = new WxTemolateRequest(openId,WxConstants.VIP_CARD_SUCCESS_TEMPLATE_ID,null,null) //TODO 后面小程序同步后加miniprogram
WxTemolateRequest tempRequest = new WxTemolateRequest(openId,WxConstants.VIP_CARD_SUCCESS_TEMPLATE_ID,null, null)
.buildData(first,remark,array); .buildData(first,remark,array);
//发送开卡成功消息模板 //发送开卡成功消息模板
wxCommonService.sendTemplateMsg(tempRequest,tokenRequest); wxCommonService.sendTemplateMsg(tempRequest,tokenRequest);