Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java

ms-api/src/main/java/com/ms/api/dto/move/DsRelationRequestDTO.java

@@ -0,0 +1,19 @@
+package com.ms.api.dto.move;
+
+import lombok.Data;
+
+/*
+ *  获取添加铺货单参数
+ */
+@Data
+public class DsRelationRequestDTO {
+    /**
+     * 抖店商品ID
+     */
+    private String platformItemId;
+
+    /**
+     * 1688商品ID
+     */
+    private String sourceItemId;
+}

ms-biz/src/main/java/com/ms/api/service/ProductToDsItemService.java

@@ -35,4 +35,6 @@ public interface ProductToDsItemService  {
     Set<String> getProductIdsByProductIdsAndPlatform(List<String> productIds, String sourcePlatform);
     
     Map<String,ProductToDsItem> getProductIdAndProductToDsItemMapByProductIds(Set<String> productIds, String sourcePlatform);
+
+    ProductToDsItem selectByProductId(Long aLong);
 }

ms-biz/src/main/java/com/ms/api/service/impl/ProductToDsItemServiceImpl.java

@@ -101,6 +101,11 @@ public class ProductToDsItemServiceImpl implements ProductToDsItemService {
         List<ProductToDsItem> rows = productToDsItemMapper.getProductIdAndProductToDsItemMapByProductIds(productIds, sourcePlatform);
         return rows.stream().collect(Collectors.toMap(ProductToDsItem::getProductId, x -> x,(v1,v2)->v1));
     }
+
+    @Override
+    public ProductToDsItem selectByProductId(Long aLong) {
+        return productToDsItemMapper.selectByProductId(aLong);
+    }
 }
 
 

ms-dal/src/main/java/com/ms/dal/mapper/ProductToDsItemMapper.java

@@ -39,4 +39,6 @@ public interface ProductToDsItemMapper {
     List<ProductToDsItem> getSearchProductToDsItemList(@Param("shopId") Long shopId, @Param("productIds") List<String> productIds, @Param("sourcePlatform") String sourcePlatform, @Param("page") Integer page, @Param("pageSize") Integer pageSize);
 
     Integer getSearchProductToDsItemCount(@Param("shopId") Long shopId, @Param("productIds") List<String> productIds, @Param("sourcePlatform") String sourcePlatform);
+
+    ProductToDsItem selectByProductId(Long aLong);
 }

ms-dal/src/main/resources/mapper/ProductToDsItemMapper.xml

@@ -22,6 +22,13 @@
         source_platform,gmt_create,gmt_modified
     </sql>
 
+    <select id="selectByProductId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from product_to_ds_item
+        where  product_id = #{productId}
+    </select>
+
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />

ms-web/src/main/java/com/ms/web/MoveController.java

@@ -1,33 +1,50 @@
 package com.ms.web;
 
-import com.jinritemai.cloud.base.api.BaseRequest;
+import com.alibaba.fastjson.JSON;
 import com.jinritemai.cloud.base.api.BaseResponse;
 import com.ms.api.common.R;
 import com.ms.api.common.Ret;
-import com.ms.api.consts.AppConst;
-import com.ms.api.dto.move.SaveBatchMoveTaskRequestDTO;
-import com.ms.api.dto.order.ManualRsyncDdOrdersDTO;
-import com.ms.api.spi.move.SaveBatchMoveTaskService;
+import com.ms.api.dto.move.DsRelationRequestDTO;
+import com.ms.api.service.ProductToDsItemService;
+import com.ms.api.tool.CommonTool;
+import com.ms.dal.entity.ProductToDsItem;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+import java.util.Objects;
+
 @Slf4j
-@CrossOrigin(origins = "*")
 @RestController
-@RequestMapping(value = "/", produces = "application/json; charset=utf-8")
 public class MoveController {
 
     @Autowired
-    SaveBatchMoveTaskService saveBatchMoveTaskService;
+    ProductToDsItemService productToDsItemService;
 
-    @PostMapping("/saveBatchMoveTask")
-    public BaseResponse<Ret> saveBatchMoveTask(@RequestBody SaveBatchMoveTaskRequestDTO dto) {
-        BaseRequest<SaveBatchMoveTaskRequestDTO> request = new BaseRequest<>();
-        request.setAuthId(AppConst.TEST_SHOP_ID);
-        request.setAppId(AppConst.TEST_APP_ID);
-        request.setData(dto);
-        return saveBatchMoveTaskService.handle(request);
+    @GetMapping("/testDsRelation")
+    public BaseResponse<Ret> testDsRelation(@ModelAttribute DsRelationRequestDTO dto) {
+        if(StringUtils.isBlank(dto.getPlatformItemId())){
+            return R.ok(CommonTool.failResult("平台商品ID不能为空"));
+        }
+        if(StringUtils.isBlank(dto.getSourceItemId())){
+            return R.ok(CommonTool.failResult("1688源商品ID不能为空"));
+        }
+        ProductToDsItem productToDsItem = productToDsItemService.selectByProductId(Long.valueOf(dto.getPlatformItemId()));
+        if(Objects.isNull(productToDsItem)){
+            productToDsItem = new ProductToDsItem();
+            productToDsItem.setProductId (dto.getPlatformItemId());
+            productToDsItem.setSourceItemId (dto.getSourceItemId());
+            productToDsItem.setShopId(4463798L);
+            productToDsItem.setGmtModified(new Date());
+            productToDsItem.setGmtCreate(new Date());
+            productToDsItemService.insertSelective(productToDsItem);
+        }else{
+            productToDsItem.setSourceItemId(dto.getSourceItemId());
+            productToDsItemService.updateByPrimaryKeySelective(productToDsItem);
+        }
+        return R.ok(CommonTool.successResult("data", JSON.toJSONString(productToDsItem)));
     }
 
 }