Merge branch 'feature/1.9.34-订单调开卡接口传门店id给会员-肖家炜'

order-application-service/src/main/java/cn/freemud/entities/dto/PurchasePaidRequestDto.java

@@ -36,5 +36,13 @@ public class PurchasePaidRequestDto {
      * 用户ID
      */
     private String memberId;
+    /**
+     * 推广门店Id
+     */
+    private String promoteStoreId;
+    /**
+     * 推广门店名称
+     */
+    private String promoteStoreName;
 
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -481,7 +481,7 @@ public class OrderServiceImpl implements Orderservice {
 
         // 开通会员卡
         if (StringUtils.isNotBlank(ruleId)) {
-            this.activateMemberCard(partnerId, ruleId, oid, userId);
+            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);
@@ -510,19 +510,22 @@ public class OrderServiceImpl implements Orderservice {
 
     /**
      * 开通会员卡
-     *
      * @param partnerId 商户号
      * @param ruleId    会员规则ID
      * @param oid       订单号
      * @param userId    用户ID
+     * @param storeId   门店id
+     * @param shopName  门店名称
      */
-    private void activateMemberCard(String partnerId, String ruleId, String oid, String userId) {
+    private void activateMemberCard(String partnerId, String ruleId, String oid, String userId, String storeId, String shopName) {
         PurchasePaidRequestDto purchasePaidRequestDto = new PurchasePaidRequestDto();
         purchasePaidRequestDto.setPartnerId(partnerId);
         purchasePaidRequestDto.setOperatorType(0);
         purchasePaidRequestDto.setRuleId(ruleId);
         purchasePaidRequestDto.setOrderId(oid);
         purchasePaidRequestDto.setMemberId(userId);
+        purchasePaidRequestDto.setPromoteStoreId(storeId);
+        purchasePaidRequestDto.setPromoteStoreName(shopName);
         // 尝试三次开通会员卡，中途成功则跳出
         int count = 3;
         for (int i = 1; i <= count; i++) {