完善商品抓取履历

src/main/java/com/dk/mnls_mp/mapper/basic/CodeHistoryMapper.xml

@@ -16,4 +16,11 @@
         from t_mst_codehistory_fac
         order by SynchID desc
     </select>
+
+    <select id="selectById" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from t_mst_codehistory_fac
+        where SynchID = #{id}
+    </select>
 </mapper>

src/main/java/com/dk/mnls_mp/model/pojo/basic/CodeHistory.java

@@ -1,5 +1,6 @@
 package com.dk.mnls_mp.model.pojo.basic;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.dongke.base.pojo.BasePojo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -7,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * t_mst_codehistory_fac
  *
@@ -17,15 +20,9 @@ import lombok.experimental.Accessors;
 @NoArgsConstructor
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
+@TableName(value = "t_iboss_data", autoResultMap = true)
 public class CodeHistory extends BasePojo {
-//    private Integer synchid;
-//
-//    private Date createtime;
-
-    /**
-     * 是否同步成功 0 失败 1 成功
-     */
+    private Integer synchId;
     private Integer status;
 
-
 }

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

@@ -1,19 +1,26 @@
 package com.dk.mnls_mp.service.basic;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dk.mnls_mp.mapper.basic.*;
+import com.dk.mnls_mp.mapper.mnls.IBOSSGoodsCodeMapper;
 import com.dk.mnls_mp.model.pojo.basic.*;
+import com.dk.mnls_mp.model.pojo.mnls.IBOSSGoodsCode;
 import com.dongke.base.annotation.Pagination;
 import com.dongke.base.dao.mapper.BaseMapper;
 import com.dongke.base.exceptionHandler.ResponseResultUtil;
 import com.dongke.base.exceptionHandler.ResponseResultVO;
 import com.dongke.base.pojo.PageList;
 import com.dongke.base.service.BaseService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +48,8 @@ public class CodeHistoryService extends BaseService<CodeHistory> {
     private AreaCalcFormulaMapper areaCalcFormulaMapper;
     @Autowired
     private CodeRecordMapper codeRecordMapper;
+    @Autowired
+    private IBOSSGoodsCodeMapper IBOSSGoodsCodeMapper;
 
     @Override
     public BaseMapper<CodeHistory> getRepository() {
@@ -56,10 +65,16 @@ public class CodeHistoryService extends BaseService<CodeHistory> {
     public ResponseResultVO getDetailList(CodeRecord codeRecord) {
         //定义返回集合
         HashMap<String, Object> map = new HashMap<>();
-        List<CodeRecord> list = codeRecordMapper.selectCodeHistoryDetail(codeRecord);
-        int total = codeRecordMapper.selectCodeHistoryDetailTotal(codeRecord);
-        map.put("data", list);
-        map.put("total", total);
+        CodeHistory codeHistory = codeHistoryMapper.selectById(codeRecord.getSynchid());
+        if(codeHistory!=null){
+            LocalDateTime dateQuery=codeHistory.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            LambdaQueryWrapper<IBOSSGoodsCode> query = new QueryWrapper<IBOSSGoodsCode>().lambda().between(IBOSSGoodsCode::getCreateTime, DateTimeFormatter.ofPattern("yyyy-MM-dd").format(dateQuery), DateTimeFormatter.ofPattern("yyyy-MM-dd").format(dateQuery.plusDays(1)))
+                    .like(StringUtils.isNotEmpty(codeRecord.getOnlycode()),IBOSSGoodsCode::getOnlyCode,codeRecord.getOnlycode())
+                    .like(StringUtils.isNotEmpty(codeRecord.getGoodsname()),IBOSSGoodsCode::getGoodsName,codeRecord.getGoodsname());
+            List<IBOSSGoodsCode> list = IBOSSGoodsCodeMapper.selectList(query);
+            map.put("data", list);
+            map.put("total", list.size());
+        }
         return ResponseResultUtil.success(map);
     }