聚水潭erp对接订单接口、商品同步接口--商品表数据库新增brand字段

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -102,6 +102,10 @@ public class FsStoreOrderController extends BaseController
     @Qualifier("dfOrderServiceImpl")
     private IErpOrderService dfOrderService;
 
+    @Autowired
+    @Qualifier("JSTErpOrderServiceImpl")
+    private IErpOrderService jSTOrderService;
+
     @Autowired
     SysConfigMapper sysConfigMapper;
 
@@ -413,6 +417,8 @@ public class FsStoreOrderController extends BaseController
                 } else if (erpType == 4){
                     //代服
                     erpOrderService =  dfOrderService;
+                }else if(erpType == 5){
+                    erpOrderService=jSTOrderService;
                 }
                 return erpOrderService;
 

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -266,7 +266,7 @@ public class Task {
         List<FsStoreOrder> orders = null;
         if (erpOrderService == gyOrderService){
             orders = fsStoreOrderMapper.selectOmsOrderdeliveryOp();
-        } else if (erpOrderService == wdtOrderService || erpOrderService == dfOrderService){
+        } else if (erpOrderService == wdtOrderService || erpOrderService == dfOrderService || erpOrderService == jSTOrderService){
             orders = fsStoreOrderMapper.selectWdtOmsOrderdeliveryOp();
         }
 
@@ -1030,6 +1030,10 @@ public class Task {
     @Qualifier("dfOrderServiceImpl")
     private IErpOrderService dfOrderService;
 
+    @Autowired
+    @Qualifier("JSTErpOrderServiceImpl")
+    private IErpOrderService jSTOrderService;
+
     private IErpOrderService getErpService() {
         FsSysConfig sysConfig = configUtil.getSysConfig();
         Integer erpOpen = sysConfig.getErpOpen();
@@ -1050,6 +1054,8 @@ public class Task {
                 } else if (erpType == 4){
                     //代服
                     erpOrderService =  dfOrderService;
+                }else if(erpType == 5){
+                    erpOrderService=jSTOrderService;
                 }
                 return erpOrderService;
 

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -527,6 +527,11 @@ public class FsStoreOrderController extends BaseController
     @Autowired
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtOrderService;
+
+    @Autowired
+    @Qualifier("JSTErpOrderServiceImpl")
+    private IErpOrderService jSTOrderService;
+
     private IErpOrderService getErpService() {
         FsSysConfig sysConfig = configUtil.getSysConfig();
         Integer erpOpen = sysConfig.getErpOpen();
@@ -541,6 +546,8 @@ public class FsStoreOrderController extends BaseController
                 } else if (erpType == 2){
                     //旺店通
                     erpOrderService =  wdtOrderService;
+                }else if(erpType == 5){
+                    erpOrderService = jSTOrderService;
                 }
                 return erpOrderService;
 

fs-service/src/main/java/com/fs/erp/domain/ErpGoods.java

@@ -21,4 +21,7 @@ public class ErpGoods {
     List<ErpCombineItem> combine_item;
     //hzOMSErp 使用 商品id
     Long storeProductId;
+
+    //适用多商品批量上传
+    List<Long> productIdList;
 }

fs-service/src/main/java/com/fs/erp/http/JstErpHttpService.java

@@ -1,5 +1,6 @@
 package com.fs.erp.http;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fs.erp.dto.*;
 import com.fs.ybPay.dto.RefundOrderDTO;
 
@@ -32,7 +33,7 @@ public interface JstErpHttpService {
      * @param dto 请求参数
      * @return ProductUploadResultDTO
      */
-    ProductUploadResultDTO uploadGoods(GoodsInfoDTO dto);
+    ProductUploadResultDTO uploadGoods(JSONObject dto);
 
     /**
      * 普通商品资料查询（按sku查询）

fs-service/src/main/java/com/fs/erp/http/JstErpHttpServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.PropertyNamingStrategy;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.serializer.SerializeConfig;
@@ -68,7 +69,7 @@ public class JstErpHttpServiceImpl implements JstErpHttpService {
     }
 
     @Override
-    public ProductUploadResultDTO uploadGoods(GoodsInfoDTO dto) {
+    public ProductUploadResultDTO uploadGoods(JSONObject dto) {
         String url = BASE_URL + "/open/jushuitan/itemsku/upload";
         log.info("上传商品信息 - URL: {}, 请求体: {}", url, JSON.toJSONString(dto));
 

fs-service/src/main/java/com/fs/erp/service/impl/JSTErpGoodsServiceImpl.java

@@ -1,22 +1,54 @@
 package com.fs.erp.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fs.common.utils.StringUtils;
 import com.fs.erp.domain.ErpGoods;
 import com.fs.erp.dto.*;
 import com.fs.erp.http.JstErpHttpService;
 import com.fs.erp.service.IErpGoodsService;
+import com.fs.his.domain.FsStoreProduct;
+import com.fs.his.domain.FsStoreProductAttrValue;
+import com.fs.his.service.IFsStoreProductAttrValueService;
+import com.fs.his.service.IFsStoreProductService;
+import com.fs.voice.utils.StringUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 @Service("JSTErpGoodsServiceImpl")
 public class JSTErpGoodsServiceImpl implements IErpGoodsService {
     @Autowired
     private JstErpHttpService jstErpHttpService;
+
+    @Autowired
+    private IFsStoreProductService fsStoreProductService;
+
+    @Autowired
+    private IFsStoreProductAttrValueService fsStoreProductAttrValueService;
+
+    // 每次最大处理数量
+    private static final int BATCH_SIZE = 190;
+
     @Override
     public BaseResponse addGoods(ErpGoods goods) {
+        List<Long> storeProductIds = goods.getProductIdList();
+        JSONArray bulidJSONArray = buildGoods(storeProductIds);
+
+        //调用接口
+        for (int i = 0; i < bulidJSONArray.size(); i += BATCH_SIZE) {
+            JSONObject request=new JSONObject();
+            int end = Math.min(i + BATCH_SIZE, bulidJSONArray.size());
+            request.put("items",bulidJSONArray.subList(i, end));
+            jstErpHttpService.uploadGoods(request);
+        }
+
         return null;
     }
 
@@ -27,7 +59,7 @@ public class JSTErpGoodsServiceImpl implements IErpGoodsService {
         ProductResponseDTO productResponseDTO = jstErpHttpService.queryGoods(requestDTO);
         List<ProductResponseDTO.ProductInfo> datas = productResponseDTO.getDatas();
         ErpGoodsQueryResponse erpGoodsQueryResponse = new ErpGoodsQueryResponse();
-        if(CollectionUtils.isNotEmpty(datas)){
+        if (CollectionUtils.isNotEmpty(datas)) {
             List<ErpGoods> erpGoodsList = new ArrayList<>();
             for (ProductResponseDTO.ProductInfo data : datas) {
                 ErpGoods erpGoods = new ErpGoods();
@@ -49,4 +81,46 @@ public class JSTErpGoodsServiceImpl implements IErpGoodsService {
     public ErpGoodsStockQueryResponse getGoodsStock(ErpGoodsStockQueryRequert param) {
         return null;
     }
+
+    /**
+     * 构建店铺商品上传的参数
+     *
+     * @param storeProductIds
+     * @return
+     */
+    public JSONArray buildGoods(List<Long> storeProductIds) {
+        JSONArray res = new JSONArray();
+        //商品
+        List<FsStoreProduct> fsStoreProductList = fsStoreProductService.getStoreProductInProductIds(storeProductIds);
+        if (!fsStoreProductList.isEmpty()) {
+
+            Map<Long, FsStoreProduct> productMap = fsStoreProductList.stream().collect(Collectors.toMap(FsStoreProduct::getProductId, p -> p));
+            //商品规格List
+            List<FsStoreProductAttrValue> fsStoreProductAttrValues = fsStoreProductAttrValueService.getFsStoreProductAttrValueListInProductId(storeProductIds);
+
+            //按规格构建商品数据
+            fsStoreProductAttrValues.forEach(v -> {
+                JSONObject productJson = new JSONObject();
+                FsStoreProduct product = productMap.get(v.getProductId());
+                productJson.put("sku_id", product.getBarCode());//商品编码
+                productJson.put("i_id", v.getBrokerage());//款式编码
+                productJson.put("name", product.getProductName());//名称
+                productJson.put("short_name", product.getKeyword());//简称
+                if(StringUtils.isNotEmpty(product.getBrand())){
+                    productJson.put("brand", product.getBrand());//品牌
+                }
+                productJson.put("weight", v.getWeight());//重量
+                productJson.put("s_price",v.getPrice());//基本售价
+                productJson.put("c_price", v.getCost());//成本
+                productJson.put("market_price", v.getOtPrice());//市场|吊牌价
+                productJson.put("unit", product.getUnitName());//单位
+                productJson.put("sku_pic", v.getImage());//商品图片
+                productJson.put("pic", product.getImgUrl());//图片地址（款图片）
+                productJson.put("pic_big", v.getImage());//大图地址
+                res.add(productJson);
+            });
+        }
+
+        return res;
+    }
 }

fs-service/src/main/java/com/fs/his/domain/FsStoreProduct.java

@@ -229,6 +229,10 @@ public class FsStoreProduct extends BaseEntity {
     @Excel(name = "是否在商品展示")
     private Integer isDisplay;
 
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String brand;
+
     /**
      * 运费模板
      */

fs-service/src/main/java/com/fs/his/mapper/FsStoreProductAttrValueMapper.java

@@ -1,7 +1,6 @@
 package com.fs.his.mapper;
 
 
-import com.fs.his.domain.FsStoreProductAttr;
 import com.fs.his.domain.FsStoreProductAttrValue;
 import com.fs.his.param.FsStoreProductAttrValueListDParam;
 import com.fs.his.vo.FsStoreProductAttrValueListDVO;
@@ -164,4 +163,11 @@ public interface FsStoreProductAttrValueMapper
 
     @Select("select * from fs_store_product_attr_value where product_id = #{productId}")
     List<FsStoreProductAttrValue> selectFsStoreProductAttrValueListByProductId(@Param("productId") Long productId);
+
+    /**
+     * 批量获取商品规格
+     * @param productIds
+     * @return productIds
+     * **/
+    List<FsStoreProductAttrValue> getFsStoreProductAttrValueListInProductId(@Param("productIds") List<Long> productIds);
 }

fs-service/src/main/java/com/fs/his/mapper/FsStoreProductMapper.java

@@ -259,4 +259,10 @@ public interface FsStoreProductMapper {
     int updateStoreProductStock(@Param("productId") Long productId, @Param("stock") Integer stock);
 
 
+    /**
+     * 批量获取商品信息
+     * @param productIds
+     * @return List<FsStoreProduct>
+     * **/
+    List<FsStoreProduct> getStoreProductInProductIds(@Param("productIds") List<Long> productIds);
 }

fs-service/src/main/java/com/fs/his/param/FsStoreProductAddEditParam.java

@@ -156,6 +156,10 @@ public class FsStoreProductAddEditParam implements Serializable {
     @Excel(name = "运费模板")
     private Long tempId;
 
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String brand;
+
     //属性项目
     private List<ProductArrtDTO> items;
     //sku结果集

fs-service/src/main/java/com/fs/his/service/IFsStoreProductAttrValueService.java

@@ -68,4 +68,11 @@ public interface IFsStoreProductAttrValueService
     int updateStoreProductAttrValueStock(Long id , Integer stock);
 
     List<FsStoreProductAttrValue> selectFsStoreProductAttrValueListByProductId( Long productId);
+
+    /**
+     * 批量获取商品规格
+     * @param productIds
+     * @return productIds
+     * **/
+    List<FsStoreProductAttrValue> getFsStoreProductAttrValueListInProductId(List<Long> productIds);
 }

fs-service/src/main/java/com/fs/his/service/IFsStoreProductService.java

@@ -97,4 +97,11 @@ public interface IFsStoreProductService
     FsStoreProduct getStoreProductByProductIdAndStoreId(Long productId, Long storeId);
 
     int updateStoreProductStock(Long productId, Integer num);
+
+    /**
+     * 批量获取商品信息
+     * @param productIds
+     * @return List<FsStoreProduct>
+     * **/
+    List<FsStoreProduct> getStoreProductInProductIds(List<Long> productIds);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -1596,6 +1596,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             return;
         }
         IErpOrderService erpOrderService = null;
+        ErpOrder erpOrder = new ErpOrder();
+        erpOrder.setShop_code(sysConfig.getErpShopCode());
         if (erpType == 1) {
             //管易
             erpOrderService = gyOrderService;
@@ -1611,6 +1613,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         } else if (erpType == 5){
             //聚水潭
             erpOrderService =  jSTOrderService;
+            erpOrder.setShop_code(sysConfig.getErpJstShopCode());
         }else {
             return;
         }
@@ -1621,7 +1624,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         if (order == null) {
             return;
         }
-        ErpOrder erpOrder = new ErpOrder();
+
         if (order.getCompanyId() != null) {
             erpOrder.setVip_code(order.getUserId().toString() + order.getCompanyId().toString());
         } else {
@@ -1629,7 +1632,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         }
         erpOrder.setPlatform_code(order.getOrderCode());
 
-        erpOrder.setShop_code(sysConfig.getErpShopCode());
+        erpOrder.setBuyer_account(order.getUserName());
         erpOrder.setSeller_memo(order.getRemark());
         List<ErpOrderPayment> payments = new ArrayList<>();
         ErpOrderPayment payment = new ErpOrderPayment();

fs-service/src/main/java/com/fs/his/service/impl/FsStoreProductAttrValueServiceImpl.java

@@ -113,4 +113,9 @@ public class FsStoreProductAttrValueServiceImpl implements IFsStoreProductAttrVa
     public List<FsStoreProductAttrValue> selectFsStoreProductAttrValueListByProductId( Long productId){
         return fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueListByProductId(productId);
     }
+
+    @Override
+    public List<FsStoreProductAttrValue> getFsStoreProductAttrValueListInProductId(List<Long> productIds) {
+        return fsStoreProductAttrValueMapper.getFsStoreProductAttrValueListInProductId(productIds);
+    }
 }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreProductServiceImpl.java

@@ -19,6 +19,7 @@ import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.fs.erp.domain.ErpGoods;
 import com.fs.erp.service.IErpGoodsService;
+import com.fs.erp.service.IErpOrderService;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.domain.*;
 import com.fs.his.dto.FsPackagePruductDTO;
@@ -71,6 +72,12 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
     @Qualifier("hzOMSErpGoodsServiceImpl")
     private IErpGoodsService hzOMSErpGoodsService;
 
+    @Autowired
+    @Qualifier("JSTErpGoodsServiceImpl")
+    private IErpGoodsService jSTErpGoodsService;
+
+
+
     /**
      * 查询商品
      *
@@ -512,6 +519,7 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
             product.setPrice(countDto.getMinPrice());
             product.setOtPrice(countDto.getMinOtPrice());
             product.setCostPrice(countDto.getMinCost());
+            product.setBarCode(param.getValues().get(0).getBarCode());
             product.setGiveIntegral(new BigDecimal(countDto.getMinIntegral()));
             product.setStock(countDto.getStock());
             fsStoreProductMapper.insertFsStoreProduct(product);
@@ -543,6 +551,11 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
                     params.setStoreProductId(product.getProductId());
                     //瀚智OMS 维护添加商品
                     hzOMSErpGoodsService.addGoods(params);
+                }else if (erpType == 5){
+                    //聚水潭商品同步
+                    ErpGoods params = new ErpGoods();
+                    params.setProductIdList(Arrays.asList(product.getProductId()));
+                    jSTErpGoodsService.addGoods(params);
                 }
             }
 
@@ -652,6 +665,8 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
 
+        //存储商品Id
+        List<Long> jstProductIds=new LinkedList<>();
         for (FsStoreProductExcelVO productVO : productList) {
             try {
 
@@ -738,6 +753,7 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
                 fsStoreProductAttrMapper.insertFsStoreProductAttr(attr);
                 successNum++;
                 successMsg.append("<br/>" + successNum + "、商品 " + product.getProductName() + " 导入成功");
+
                 //todo 添加商品HzOMSerp调用
                 //判断是否开启erp
                 FsSysConfig sysConfig = configUtil.getSysConfig();
@@ -754,6 +770,8 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
                         params.setStoreProductId(product.getProductId());
                         //瀚智OMS 维护添加商品
                         hzOMSErpGoodsService.addGoods(params);
+                    }else if(erpType == 5){
+                        jstProductIds.add(product.getProductId());
                     }
                 }
             } catch (Exception e) {
@@ -763,6 +781,16 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
                 failureMsg.append(msg + e.getMessage());
             }
         }
+
+        //验证聚水潭商品Id
+        if(!jstProductIds.isEmpty()){
+            //同步聚水潭商品
+            ErpGoods params = new ErpGoods();
+            params.setProductIdList(jstProductIds);
+            jSTErpGoodsService.addGoods(params);
+        }
+
+
         if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
@@ -826,4 +854,8 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
         return fsStoreProductMapper.updateStoreProductStock(productId, num);
     }
 
+    @Override
+    public List<FsStoreProduct> getStoreProductInProductIds(List<Long> productIds) {
+        return fsStoreProductMapper.getStoreProductInProductIds(productIds);
+    }
 }

fs-service/src/main/resources/application-config-druid-xzt.yml

@@ -87,9 +87,9 @@ wx_miniapp_temp:
   inquiry_temp_id:
 # 聚水潭API配置
 jst:
-  app_key: bd7a7d06a6d54377842f883f9a4c502a
-  app_secret: 1d112cb9d21d41e187ff824b5852f4cf
-  authorization_code: zzzzzz
+  app_key: a4b1fab173c84f67b3873857eea11d90 #聚水潭2025-07-25
+  app_secret: dfce1f8dc8a64ddc91212fc3fcdd9349 #聚水潭2025-07-25
+  authorization_code: 666666
   shop_code: "18461733"
 
 

fs-service/src/main/resources/mapper/his/FsStoreProductAttrValueMapper.xml

@@ -134,4 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="getFsStoreProductAttrValueListInProductId" resultType="com.fs.his.domain.FsStoreProductAttrValue">
+        select *,cost_price AS cost from fs_store_product_attr_value where product_id IN <foreach collection="productIds" index="index" item="item" open="(" separator="," close=")">#{item}</foreach>
+    </select>
+
 </mapper>

fs-service/src/main/resources/mapper/his/FsStoreProductMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsStoreProductVo">
-        select product_id,is_prescribe,is_drug, store_id, img_url, images, product_name, product_introduce, keyword, bar_code, cate_id, price, ot_price, unit_name, sort, sales, stock, is_show, is_hot, is_benefit, is_best, is_new, `desc`, create_time, update_time, is_postage, is_del, give_integral, cost_price, views, code_url, spec_type, product_type, prescribe_code, prescribe_spec, prescribe_factory, prescribe_name, is_display, temp_id from fs_store_product
+        select product_id,is_prescribe,is_drug, store_id, img_url, images, product_name, product_introduce, keyword, bar_code, cate_id, price, ot_price, unit_name, sort, sales, stock, is_show, is_hot, is_benefit, is_best, is_new, `desc`, create_time, update_time, is_postage, is_del, give_integral, cost_price, views, code_url, spec_type, product_type, prescribe_code, prescribe_spec, prescribe_factory, prescribe_name, is_display, temp_id,brand from fs_store_product
     </sql>
 
     <select id="selectFsStoreProductList" parameterType="FsStoreProduct" resultMap="FsStoreProductResult">
@@ -140,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tempId != null">temp_id,</if>
             <if test="isPrescribe != null">is_prescribe,</if>
             <if test="isDrug != null">is_drug,</if>
+            <if test="brand != null">brand,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="storeId != null">#{storeId},</if>
@@ -180,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tempId != null">#{tempId},</if>
             <if test="isPrescribe != null">#{isPrescribe},</if>
             <if test="isDrug != null">#{isDrug},</if>
+            <if test="brand != null">#{brand},</if>
          </trim>
     </insert>
 
@@ -238,4 +240,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{productId}
         </foreach>
     </delete>
+
+    <select id="getStoreProductInProductIds" resultType="com.fs.his.domain.FsStoreProduct">
+        <include refid="selectFsStoreProductVo"/>
+        where product_id IN <foreach collection="productIds" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+    </foreach>
+    </select>
 </mapper>

fs-store/src/main/java/com/fs/store/controller/store/FsStoreOrderController.java

@@ -68,6 +68,11 @@ public class FsStoreOrderController extends BaseController
     @Autowired
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtOrderService;
+
+    @Autowired
+    @Qualifier("JSTErpOrderServiceImpl")
+    private IErpOrderService jSTOrderService;
+
     /**
      * 查询订单列表
      */
@@ -343,7 +348,11 @@ public class FsStoreOrderController extends BaseController
                 } else if (erpType == 2){
                     //旺店通
                     erpOrderService =  wdtOrderService;
+                }else if (erpType == 5){
+                    //聚水潭
+                    erpOrderService =  jSTOrderService;
                 }
+
                 return erpOrderService;