设备商城金额换成真实,配置文件更改,配置微信模板消息,快递鸟相关

This commit is contained in:
liuyingfang
2023-06-03 09:22:51 +08:00
parent 6f6938daa4
commit 3c6085805f
14 changed files with 61 additions and 33 deletions

View File

@@ -82,6 +82,7 @@ public class WechantController {
private RestTemplate restTemplate;
@Resource
private MerchantBaseInfoService merchantBaseInfoService;
/**
*
* goUpgradePage:(跳转到升级页面). <br/>
@@ -407,13 +408,13 @@ public class WechantController {
}
merchantMenberService.updateMerchantMenber(merchantMenber);
try {
// MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode());
// MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode());
MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantMenber.getMerchantCode());
JSONObject miniprogram = new JSONObject();
miniprogram.put("appid",ParametersUtil.APPLETS_APPID);
miniprogram.put("pagepath","yb_o2ov2/vip/my-vip?syb_m_id="+merchantBaseInfo.getId()+"&phone="+merchantMenber.getPhone()+
"&memberCode"+merchantMenber.getMemberCode());
"&memberCode"+merchantMenber.getMemberCode());
String first = "恭喜您成为本店会员,祝你生活愉快!";
String remark = "如对此卡有疑问或查询会员更多优惠信息,可以点此进入小程序中查看!";
double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableRechargeFee());
@@ -481,7 +482,9 @@ public class WechantController {
@ResponseBody
public Result<Object> orderPay(@RequestBody JSONObject params) {
String openid = params.getString("openid");
System.out.println("openid"+openid);
String orderNumber = params.getString("orderNumber");
System.out.println("orderNumber"+orderNumber);
return apiPayService.orderPay(openid,orderNumber);
}