Commit 277660b3 by vega

1.9.34 根据会员给的字段,添加推广门店名称字段

parent 9b69cae2
...@@ -37,8 +37,12 @@ public class PurchasePaidRequestDto { ...@@ -37,8 +37,12 @@ public class PurchasePaidRequestDto {
*/ */
private String memberId; private String memberId;
/** /**
* 门店ID * 推广门店Id
*/ */
private String storeId; private String promoteStoreId;
/**
* 推广门店名称
*/
private String promoteStoreName;
} }
...@@ -485,7 +485,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -485,7 +485,7 @@ public class OrderServiceImpl implements Orderservice {
// 开通会员卡 // 开通会员卡
if (StringUtils.isNotBlank(ruleId)) { if (StringUtils.isNotBlank(ruleId)) {
this.activateMemberCard(partnerId, ruleId, oid, userId, storeId); this.activateMemberCard(partnerId, ruleId, oid, userId, storeId, orderBean.getShopName());
} }
//支付回掉成功标记 //支付回掉成功标记
redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES); redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
...@@ -519,15 +519,17 @@ public class OrderServiceImpl implements Orderservice { ...@@ -519,15 +519,17 @@ public class OrderServiceImpl implements Orderservice {
* @param oid 订单号 * @param oid 订单号
* @param userId 用户ID * @param userId 用户ID
* @param storeId 门店id * @param storeId 门店id
* @param shopName 门店名称
*/ */
private void activateMemberCard(String partnerId, String ruleId, String oid, String userId, String storeId) { private void activateMemberCard(String partnerId, String ruleId, String oid, String userId, String storeId, String shopName) {
PurchasePaidRequestDto purchasePaidRequestDto = new PurchasePaidRequestDto(); PurchasePaidRequestDto purchasePaidRequestDto = new PurchasePaidRequestDto();
purchasePaidRequestDto.setPartnerId(partnerId); purchasePaidRequestDto.setPartnerId(partnerId);
purchasePaidRequestDto.setOperatorType(0); purchasePaidRequestDto.setOperatorType(0);
purchasePaidRequestDto.setRuleId(ruleId); purchasePaidRequestDto.setRuleId(ruleId);
purchasePaidRequestDto.setOrderId(oid); purchasePaidRequestDto.setOrderId(oid);
purchasePaidRequestDto.setMemberId(userId); purchasePaidRequestDto.setMemberId(userId);
purchasePaidRequestDto.setStoreId(storeId); purchasePaidRequestDto.setPromoteStoreId(storeId);
purchasePaidRequestDto.setPromoteStoreName(shopName);
// 尝试三次开通会员卡,中途成功则跳出 // 尝试三次开通会员卡,中途成功则跳出
int count = 3; int count = 3;
for (int i = 1; i <= count; i++) { for (int i = 1; i <= count; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment