1:供应商修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/ProductInfoController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.scm;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.scm.domain.SupplierInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -8,6 +9,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
@@ -121,7 +123,16 @@ public class ProductInfoController extends BaseController
     @ResponseBody
     public AjaxResult editSave(ProductInfo productInfo)
     {
-        return toAjax(productInfoService.updateProductInfo(productInfo));
+        Map<String, Object> map = productInfoService.updateProductInfo(productInfo);
+        String resultCode = map.get("resultCode").toString();
+        if (CollectionUtils.isEmpty(map)){
+            return AjaxResult.error("未知异常");
+        }
+        if ("00".equals(resultCode)){
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error(map.get("resultMsg").toString());
+        }
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/scm/service/IProductInfoService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.scm.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.scm.domain.ProductInfo;
 
 /**
@@ -41,7 +43,7 @@ public interface IProductInfoService
      * @param productInfo 商品
      * @return 结果
      */
-    public int updateProductInfo(ProductInfo productInfo);
+    public Map<String, Object> updateProductInfo(ProductInfo productInfo);
 
     /**
      * 批量删除商品

ruoyi-system/src/main/java/com/ruoyi/scm/service/impl/ProductInfoServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.*;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.scm.domain.SupplierInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,6 +13,7 @@ import com.ruoyi.scm.mapper.ProductInfoMapper;
 import com.ruoyi.scm.domain.ProductInfo;
 import com.ruoyi.scm.service.IProductInfoService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 商品Service业务层处理
@@ -71,25 +73,40 @@ public class ProductInfoServiceImpl implements IProductInfoService
      * @return 结果
      */
     @Override
-    public int updateProductInfo(ProductInfo productInfo)
-    {
+    public Map<String, Object> updateProductInfo(ProductInfo productInfo) {
         //查询商品信息
         ProductInfo productInfo1 = productInfoMapper.selectProductInfoById(productInfo.getId());
-        if ("20".equals(productInfo.getType())){
+        String resultJson = null;
+        Map<String, Object> resultMap = null;
+        if ("20".equals(productInfo.getType())) {
             //下架的情况
             Map<String, Object> map = new HashMap<>();
             map.put("token", "123456");
             map.put("supplierCode", productInfo1.getSupplierId());
             Set<String> strings = new HashSet<>();
             strings.add(productInfo1.getThirdSpuId());
-            map.put("thirdSkuIds",strings);
+            map.put("thirdSkuIds", strings);
             map.put("type", 20);
             map.put("typeMsg", "测试");
             String string = JSON.toJSONString(map);
-            String s = HttpUtils.sendPost(zsDown, string);
-            log.info(s);
+            resultJson = HttpUtils.JSONdoPost(zsDown, string);
+            //解析数据
+            resultMap = JSON.parseObject(resultJson, Map.class);
+            if (!CollectionUtils.isEmpty(resultMap)) {
+                if (resultMap.get("resultCode").equals("00")) {
+                    productInfoMapper.updateProductInfo(productInfo);
+
+//                    ProductInfo productInfo2 = productInfoMapper.selectProductInfoById(productInfo1.getId());
+//                    productInfo2.setType("10");
+////                    supplierInfoNew1.setRefuseMsg(null);
+//                    //直接进行数据修改
+//                    productInfoMapper.updateProductInfo(productInfo2);
+                }
+            }
+            log.info(resultJson);
         }
-        return productInfoMapper.updateProductInfo(productInfo);
+
+        return resultMap;
     }
 
     /**