商户表新增字段

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/pojo/Vendor.java

@@ -61,4 +61,10 @@ public class Vendor implements Serializable {
     private String gpToken;
 
     private String statusMsg;
+
+    @ApiModelProperty("获取商店9710模块url")
+    private String storeUrlBy9710;
+
+    @ApiModelProperty("获取商店9810模块url")
+    private String storeUrlBy9810;
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/config/StoreConfig.java

@@ -0,0 +1,13 @@
+package com.slodon.b2b2c.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "store")
+@Data
+public class StoreConfig {
+    private String url;
+    private String token;
+}

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreModel.java

@@ -1,6 +1,7 @@
 package com.slodon.b2b2c.model.seller;
 
 import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.slodon.b2b2c.business.dto.OrderDayDTO;
 import com.slodon.b2b2c.business.example.OrderExample;
 import com.slodon.b2b2c.core.constant.*;
@@ -22,7 +23,6 @@ import com.slodon.b2b2c.goods.example.GoodsExample;
 import com.slodon.b2b2c.goods.example.GoodsExtendExample;
 import com.slodon.b2b2c.goods.pojo.Goods;
 import com.slodon.b2b2c.goods.pojo.GoodsExtend;
-import com.slodon.b2b2c.investment.constant.AnalysisConst;
 import com.slodon.b2b2c.member.example.MemberFollowStoreExample;
 import com.slodon.b2b2c.member.pojo.MemberFollowStore;
 import com.slodon.b2b2c.model.goods.GoodsModel;
@@ -33,6 +33,7 @@ import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.system.example.SysSeoExample;
 import com.slodon.b2b2c.system.pojo.Admin;
 import com.slodon.b2b2c.system.pojo.SysSeo;
+import com.slodon.b2b2c.config.StoreConfig;
 import com.slodon.b2b2c.vo.goods.SysSeoVO;
 import com.slodon.smartid.client.utils.SmartId;
 import lombok.extern.slf4j.Slf4j;
@@ -117,6 +118,9 @@ public class StoreModel {
     @Resource
     private StoreCreateDataModel storeCreateDataModel;
 
+    @Resource
+    private StoreConfig storeConfig;
+
     /**
      * 新增店铺表
      *
@@ -220,11 +224,15 @@ public class StoreModel {
             throw new MallException("修改店铺可用商品分类申请表失败，请重试");
         }
 
+        JSONObject jsonObject = getStoreUrlsObject(store.getStoreId(), storeApply.getVendorName());
+
         //关联storeId与vendor表
         Vendor vendor = new Vendor();
         vendor.setVendorId(storeApply.getVendorId());
         vendor.setStoreId(store.getStoreId());
         vendor.setVendorName(storeApply.getVendorName());
+        vendor.setStoreUrlBy9710(jsonObject.getStr("9710"));
+        vendor.setStoreUrlBy9810(jsonObject.getStr("9810"));
         count = vendorWriteMapper.updateByPrimaryKeySelective(vendor);
         if (count == 0) {
             throw new MallException("修改商家管理员表失败，请重试");
@@ -356,6 +364,9 @@ public class StoreModel {
         List<Vendor> vendorList = vendorReadMapper.listByExample(vendorMobileExample);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
 
+        //获取店铺注册外部接口9710、9810模块url
+        JSONObject jsonObject = getStoreUrlsObject(storeId, ownStoreAddDTO.getVendorName());
+
         vendor.setVendorMobile(ownStoreAddDTO.getContactPhone());
         vendor.setVendorId(SmartId.nextId(BizTypeConst.VENDOR));
         vendor.setVendorName(ownStoreAddDTO.getVendorName());
@@ -365,6 +376,8 @@ public class StoreModel {
         vendor.setRegisterTime(new Date());
         vendor.setLatestLoginTime(new Date());
         vendor.setRolesId(2);
+        vendor.setStoreUrlBy9710(jsonObject.getStr("9710"));
+        vendor.setStoreUrlBy9810(jsonObject.getStr("9810"));
         count = vendorWriteMapper.insert(vendor);
         if (count == 0) {
             throw new MallException("添加管理员表失败，请重试");
@@ -414,6 +427,29 @@ public class StoreModel {
     }
 
     /**
+     * 获取店铺注册外部接口9710、9810模块url
+     * @param storeId
+     * @param authorName
+     * @return
+     */
+    public JSONObject getStoreUrlsObject(Long storeId, String authorName) {
+        HashMap<String, String> headers = new HashMap<>();
+        headers.put("Authorization", storeConfig.getToken());
+        JSONObject param = new JSONObject();
+        param.set("storeId", storeId.toString());
+        param.set("authorName", authorName);
+        String result;
+        try {
+            result = HttpClientUtil.httpPost(storeConfig.getUrl(), param.toString(), headers);
+        } catch (Exception e) {
+            throw new MallException("获取店铺url信息表失败，请重试");
+        }
+        JSONObject jsonObject = JSONUtil.parseObj(result);
+        jsonObject = jsonObject.getJSONObject("data");
+        return jsonObject;
+    }
+
+    /**
      * 根据storeId删除店铺表
      *
      * @param storeId storeId

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/VendorModel.java

@@ -1,5 +1,6 @@
 package com.slodon.b2b2c.model.seller;
 
+import cn.hutool.json.JSONObject;
 import com.gexin.fastjson.JSON;
 import com.slodon.b2b2c.core.constant.BizTypeConst;
 import com.slodon.b2b2c.core.constant.SMSConst;
@@ -52,6 +53,8 @@ public class VendorModel {
     private StoreReadMapper storeReadMapper;
     @Resource
     private StringRedisTemplate stringRedisTemplate;
+    @Resource
+    private StoreModel storeModel;
 
     /**
      * 新增商家表
@@ -93,6 +96,8 @@ public class VendorModel {
         count = vendorReadMapper.countByExample(example);
         AssertUtil.isTrue(count > 0, "该邮箱已被其他账号绑定，请重新填写");
 
+        JSONObject jsonObject=storeModel.getStoreUrlsObject(storeId,vendorAddDTO.getVendorName());
+
         //添加vendor
         Vendor vendor = new Vendor();
         BeanUtils.copyProperties(vendorAddDTO, vendor);
@@ -104,6 +109,8 @@ public class VendorModel {
         vendor.setLatestLoginTime(new Date());
         vendor.setIsAllowLogin(VendorConst.IS_ALLOW_LOGIN);
         vendor.setLatestLoginIp(ip);
+        vendor.setStoreUrlBy9710(jsonObject.getStr("storeUrlBy9710"));
+        vendor.setStoreUrlBy9810(jsonObject.getStr("storeUrlBy9810"));
         this.saveVendor(vendor);
     }
 

xinkeaboard-server/b2b2c-web/src/main/resources/application-dev.yml

@@ -66,3 +66,7 @@ analysis:
   rankedKeywords: https://api.dataforseo.com/v3/dataforseo_labs/google/ranked_keywords/live
   historicalTraffic: https://api.dataforseo.com/v3/dataforseo_labs/google/historical_bulk_traffic_estimation/live
   modelName: gemini-2.5-flash
+
+store:
+  url: https://xinke.sutextech.com/api/get_store_urls/
+  token: Token 7858e42dcc68d1bb090438a0baab69b085f4b57e

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/seller/VendorReadMapper.xml

@@ -17,6 +17,8 @@
     <result column="roles_id" property="rolesId" />
     <result column="gp_uid" property="gpUid" />
     <result column="gp_token" property="gpToken" />
+    <result column="store_url_by9710" property="storeUrlBy9710" />
+    <result column="store_url_by9810" property="storeUrlBy9810" />
   </resultMap>
   <!--按照主键值进行操作-->
   <sql id="pkWhere">
@@ -92,6 +94,12 @@
         <if test="example.gpToken != null">
           AND `gp_token` = #{example.gpToken}
         </if>
+        <if test="example.storeUrlBy9710 != null">
+          AND `store_url_by9710`= #{example.storeUrlBy9710}
+        </if>
+        <if test="example.storeUrlBy9810 != null">
+          AND `store_url_by9810`= #{example.storeUrlBy9810}
+        </if>
       </trim>
     </if>
   </sql>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/seller/VendorWriteMapper.xml

@@ -17,6 +17,8 @@
     <result column="roles_id" property="rolesId" />
     <result column="gp_uid" property="gpUid" />
     <result column="gp_token" property="gpToken" />
+    <result column="store_url_by9710" property="storeUrlBy9710" />
+    <result column="store_url_by9810" property="storeUrlBy9810" />
   </resultMap>
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
@@ -66,6 +68,12 @@
       <if test="gpToken != null">
         `gp_token`,
       </if>
+      <if test="storeUrlBy9710 != null">
+        `store_url_by9710`,
+      </if>
+      <if test="storeUrlBy9810 != null">
+        `store_url_by9810`,
+      </if>
     </trim>
   </sql>
   <!--按照主键值进行操作-->
@@ -133,6 +141,12 @@
         <if test="example.gpToken != null">
           AND `gp_token` = #{example.gpToken}
         </if>
+        <if test="example.storeUrlBy9710 != null">
+          AND `store_url_by9710`= #{example.storeUrlBy9710}
+        </if>
+        <if test="example.storeUrlBy9810 != null">
+          AND `store_url_by9810`= #{example.storeUrlBy9810}
+        </if>
       </trim>
     </if>
   </sql>
@@ -303,6 +317,12 @@
       <if test="gpToken != null">
         #{gpToken},
       </if>
+      <if test="storeUrlBy9710 != null">
+        #{storeUrlBy9710},
+      </if>
+      <if test="storeUrlBy9810 != null">
+        #{storeUrlBy9810},
+      </if>
     </trim>
     )
   </insert>
@@ -352,6 +372,12 @@
       <if test="record.gpToken != null">
         `gp_token` = #{record.gpToken},
       </if>
+      <if test="record.storeUrlBy9710 != null">
+        `store_url_by9710` = #{record.storeUrlBy9710},
+      </if>
+      <if test="record.storeUrlBy9810 != null">
+        `store_url_by9810` = #{record.storeUrlBy9810},
+      </if>
     </trim>
     <include refid="whereCondition" />
   </update>
@@ -401,6 +427,12 @@
       <if test="gpToken != null">
         `gp_token` = #{gpToken},
       </if>
+      <if test="storeUrlBy9710 != null">
+        `store_url_by9710` = #{storeUrlBy9710},
+      </if>
+      <if test="storeUrlBy9810 != null">
+        `store_url_by9810` = #{storeUrlBy9810},
+      </if>
     </trim>
     WHERE `vendor_id` = #{vendorId}
   </update>

xinkeaboard-server/doc/DDL/update.sql

@@ -347,6 +347,12 @@ update msg_store_tpl set email_content='{"email_subject":"新询盘提醒-{$site
 
 ALTER TABLE enquiry MODIFY COLUMN page_url VARCHAR(2048) COMMENT '询盘来源页面URL';
 
+ALTER TABLE vendor ADD COLUMN store_url_by9710 VARCHAR(1000)  DEFAULT NULL COMMENT '9710模块url' AFTER gp_token;
+
+ALTER TABLE vendor ADD COLUMN store_url_by9810 VARCHAR(1000)  DEFAULT NULL COMMENT '9810模块url' AFTER store_url_by9710;
+
+
+