|
|
@@ -203,7 +203,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
//商品名称
|
|
|
String product = "采美订单" + orderId;
|
|
|
json.put("product", product);
|
|
|
- String attach = payParam.getProductId() + "," + payParam.getPayType();
|
|
|
+ String attach = payParam.getProductId() + "," + payParam.getPayType() + "," + payParam.getUserType();
|
|
|
json.put("attach", attach);
|
|
|
// 二手发布默认100元,默认私账
|
|
|
List<Map<String, String>> list = new ArrayList<>();
|
|
|
@@ -294,10 +294,11 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
//存收款列表
|
|
|
Date date = new Date();
|
|
|
String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
|
|
|
+ String payTyp = PayUtil.getPayTypeId(payType, split[2]);
|
|
|
// 保存收款记录
|
|
|
DiscernReceiptPo discernReceipt = new DiscernReceiptPo();
|
|
|
discernReceipt.setPayWay(1);
|
|
|
- discernReceipt.setPayType(Integer.valueOf(payType));
|
|
|
+ discernReceipt.setPayType(Integer.valueOf(payTyp));
|
|
|
discernReceipt.setReceiptType(7);
|
|
|
discernReceipt.setReceiptStatus(3);
|
|
|
discernReceipt.setReceiptAmount(amount);
|
|
|
@@ -679,7 +680,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
String bindMobile = baseMapper.getBindMobileByUserId(userId);
|
|
|
if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
|
|
|
String shortLink = remoteCallService.getShortLink(8, 2, "https://www.caimei365.com/user/member.html?userId=" + userId);
|
|
|
- String content = "恭喜您成功开通采美平台超级会员，为期"+mouth+"个月，快戳采美网站链接www.caimei365.com/t/" + shortLink+ "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
|
|
|
+ String content = "恭喜您成功开通采美平台超级会员，为期" + mouth + "个月，快戳采美网站链接www.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
|
|
|
boolean sendSms = remoteCallService.getSendSms(2, bindMobile, content);
|
|
|
if (!sendSms) {
|
|
|
log.info("购买会员短信推送失败");
|
