增加计量单位字段

src/main/java/com/dk/mnls_mp/infrastructure/convert/IBOSSGoodsCodeConvert.java

@@ -35,6 +35,7 @@ public interface IBOSSGoodsCodeConvert {
             @Mapping(expression = "java(getKindName(facCodeDetailDto.getBigClassName()))", target = "kindName"),
             @Mapping(expression = "java(facCodeDetailDto.getCatName())", target = "seriesName"),
             @Mapping(expression = "java(getVarietyName(facCodeDetailDto.getMidClassName(),facCodeDetailDto.getSmallClassName()))", target = "varietyName"),
+            @Mapping(expression = "java(facCodeDetailDto.getMinUomName())", target = "unitName"),
     })
     IBOSSGoodsCode facDTO2IBOSSGoodsCodePO (FacCodeDetailDTO facCodeDetailDto);
 

src/main/java/com/dk/mnls_mp/mapper/mnls/IBOSSGoodsCodeMapper.xml

@@ -117,6 +117,7 @@
             kind_name,
             series_name,
             variety_name,
+            unit_name,
         </trim>
         )
         values
@@ -132,6 +133,7 @@
                 #{item.kindName},
                 #{item.seriesName},
                 #{item.varietyName},
+                #{item.unitName},
             </trim>
             )
         </foreach>

src/main/java/com/dk/mnls_mp/model/dto/FacCodeDetailDTO.java

@@ -64,4 +64,11 @@ public class FacCodeDetailDTO {
      */
     private String smallClassName;
 
+    /**
+     * 商品计量单位=>(iBOSS-计量单位)
+     */
+    private String minUomName;
+
+
+
 }

src/main/java/com/dk/mnls_mp/model/pojo/mnls/IBOSSGoodsCode.java

@@ -28,60 +28,55 @@ public class IBOSSGoodsCode implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-
     /**
      * 美云商品信息唯一键
      */
     private Long itemId;
 
-
     /**
      * iBOSS唯一编码
      */
     private String onlyCode;
 
-
     /**
      * iBOSS商品编码
      */
     private String code;
 
-
     /**
      * iBOSS商品名称
      */
     private String goodsName;
 
-
     /**
      * iBOSS规格
      */
     private String specification;
 
-
     /**
      * 包装数
      */
     private BigDecimal packageNum;
 
-
     /**
      * 种类
      */
     private String kindName;
 
-
     /**
      * 系列
      */
     private String seriesName;
 
-
     /**
      * 品种
      */
     private String varietyName;
 
+    /**
+     * 计量单位
+     */
+    private String unitName;
 
     /**
      * 创建时间

src/main/java/com/dk/mnls_mp/model/vo/IBOSSGoodsCodeVO.java

@@ -69,6 +69,13 @@ public class IBOSSGoodsCodeVO implements Serializable {
     private String varietyName;
 
 
+    /**
+     * 计量单位
+     */
+    private String unitName;
+
+
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mnls_mp/service/basic/BomService.java

@@ -371,7 +371,7 @@ public class BomService extends BaseService<Bom> {
         customerInfo.put("bomList", boms);
         /* 设置一下参数 */
         param.put("customerInfo", customerInfo);
-        log.info("=*=*=*=*=*=*=*=*=" + "参数:" + param + "=*=*=*=*=*=*=*=*=");
+        log.info("=*=*=*=*=*=*=*=*=" + "参数:" + JSON.toJSONString(param) + "=*=*=*=*=*=*=*=*=");
         return HttpHelper.post(url, param);
     }
 

src/main/java/com/dk/mnls_mp/service/inventory/InventoryService.java

@@ -1,5 +1,6 @@
 package com.dk.mnls_mp.service.inventory;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.dk.mnls_mp.infrastructure.base.ResponseCodeEnum;
 import com.dk.mnls_mp.mapper.basic.CustomerMapper;
@@ -112,7 +113,7 @@ public class InventoryService extends BaseService<Inventory> {
             //customerInfo.put("port","1000");
             param.put("customerInfo", customerInfo);
 
-            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + param + "=*=*=*=*=*=*=*=*=");
+            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + JSON.toJSONString(param) + "=*=*=*=*=*=*=*=*=");
 
 
             log.info("=*=*=*=*=*=*=*=*=" + "IBOSS项目url:" + customerInfo.get("ip") + ":" + customerInfo.get("port") + "=*=*=*=*=*=*=*=*=");
@@ -241,7 +242,7 @@ public class InventoryService extends BaseService<Inventory> {
         customerInfo.put("port","1019");*/
         param.put("customerInfo", customerInfo);
 
-        System.out.println("=*=*=*=*=*=*=*=*=" + "参数:" + param + "=*=*=*=*=*=*=*=*=");
+        System.out.println("=*=*=*=*=*=*=*=*=" + "参数:" + JSON.toJSONString(param) + "=*=*=*=*=*=*=*=*=");
 
 
         System.out.println("=*=*=*=*=*=*=*=*=" + "IBOSS项目url:" + customerInfo.get("ip") + ":" + customerInfo.get("port") + "=*=*=*=*=*=*=*=*=");

src/main/java/com/dk/mnls_mp/service/mnls/PullIBOSSDataService.java

@@ -111,7 +111,7 @@ public class PullIBOSSDataService {
             param.put("PageNum","0");
             param.put("PageSize","0");
 
-            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + param + "=*=*=*=*=*=*=*=*=");
+            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + JSON.toJSONString(param) + "=*=*=*=*=*=*=*=*=");
 
             //调用接口
             Date startTime = new Date();

src/main/java/com/dk/mnls_mp/service/mnls/SyncIBOSSGoodsCode.java

@@ -63,7 +63,7 @@ public class SyncIBOSSGoodsCode {
             param.put("userCode",customer.getUniqueCode());
             param.put("goodsCode",goodsCodeList);
 
-            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + param + "=*=*=*=*=*=*=*=*=");
+            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + JSON.toJSONString(param)+ "=*=*=*=*=*=*=*=*=");
             //调用接口
             ResponseResultVO resultVO = HttpHelper.callIBOSSWebservice(url, param,null);
 
@@ -80,7 +80,7 @@ public class SyncIBOSSGoodsCode {
                     return ResponseResultUtil.success(200,"同步商品编码成功，经销商id=>"+customer.getCustomerid());
                 }else{
                     //失败记录信息
-                    synchStatusMapper.updateByID(new HashMap(){{put("SynchID",syncId);put("Message",IBOSSDTO.getMessage());}});
+                    synchStatusMapper.updateByID(new HashMap(){{put("SynchID",syncId);put("Status",0);put("Message",IBOSSDTO.getMessage());}});
                     log.info("同步iBOSS商品编码失败，iBOSS接口状态码不等于0，经销商id=>{},接口返回值=>{}",customer.getCustomerid(),IBOSSDTO);
                     return ResponseResultUtil.error(666,"同步iBOSS商品编码失败，iBOSS接口状态码不等于0，经销商id=>"+customer.getCustomerid());
                 }

src/main/java/com/dk/mnls_mp/service/synchCode/SynchCodeService.java

@@ -1,5 +1,6 @@
 package com.dk.mnls_mp.service.synchCode;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dk.mnls_mp.infrastructure.base.ResponseCodeEnum;
@@ -383,7 +384,7 @@ public class SynchCodeService {
             /* 设置一下参数 */
             param.put("customerInfo", customerInfo);
             ResponseResultVO resultVO = HttpHelper.post(url, param);
-            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + param + "=*=*=*=*=*=*=*=*=");
+            log.info("=*=*=*=*=*=*=*=*=" + "参数:" + JSON.toJSONString(param) + "=*=*=*=*=*=*=*=*=");
             if (resultVO.getCode() == 200) {
                 //更新这个经销商 不再是新上线经销商
                 //customerMapper.updateCustomerForOld(wcfInfo.getCustomerid());

src/main/java/com/dk/mnls_mp/test/ApiTest.java

@@ -86,7 +86,8 @@ public class ApiTest {
         //获取同步总表id
         int syncId = Integer.valueOf(syncRecord.get("syncId").toString());
         //获取需要同步的编码
-        List<IBOSSGoodsCodeVO> list = IBOSSGoodsCodeConvert.goodsCodePO2IBOSSVO(IBOSSGoodsCodeMapper.selectList(new QueryWrapper<IBOSSGoodsCode>().lambda().gt(IBOSSGoodsCode::getCreateTime, DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDateTime.now()))));
+        List<IBOSSGoodsCodeVO> list = IBOSSGoodsCodeConvert.goodsCodePO2IBOSSVO(IBOSSGoodsCodeMapper.selectList(new QueryWrapper<IBOSSGoodsCode>().lambda()
+                .gt(IBOSSGoodsCode::getCreateTime, DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDateTime.now()))));
         //有新编码需要同步，再调用接口同步
         if(list.size()>0){
             //循环同步所有经销商