转移单逻辑代码提交

kmall-admin/src/main/java/com/kmall/admin/controller/kmall2oms/KtoOmsController.java

@@ -2,6 +2,11 @@ package com.kmall.admin.controller.kmall2oms;
 
 import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
+import com.kmall.admin.dto.TransferGoodsDto;
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
+import com.kmall.admin.entity.StoreTransferInventoryOrderEntity;
+import com.kmall.admin.service.StoreTransferInventoryOrderDetailService;
+import com.kmall.admin.service.StoreTransferInventoryOrderService;
 import com.kmall.admin.utils.data.response.ResponseMessage;
 import com.kmall.admin.utils.oms.OmsSign;
 import com.kmall.common.utils.R;
@@ -11,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -32,34 +38,53 @@ public class KtoOmsController {
     @Autowired
     private OmsMerchProperties omsMerchProperties;
 
+    @Autowired
+    private StoreTransferInventoryOrderService storeTransferInventoryOrderService ;
+
+    @Autowired
+    private StoreTransferInventoryOrderDetailService storeTransferInventoryOrderDetailService;
+
+    @RequestMapping("sendTransfer/{transferId}")
+    public R sendToTransferOrder(@PathVariable("transferId") Integer transferId){
+
+
 
-    @RequestMapping("sendTransfer")
-    public R sendToTransferOrder(Integer transferId){
 
         // 查询转移单记录与明细
-        // TODO queryById(transferId)
-        // TODO queryDetailByTransferId(transferId)
-        List detailList = new ArrayList<>();
+        // queryById(transferId)
+        StoreTransferInventoryOrderEntity storeTransferInventoryOrderEntity = storeTransferInventoryOrderService.queryObject(transferId);
+        if(storeTransferInventoryOrderEntity == null){
+            return R.error("未找到该转移单");
+        }
+        Integer status = storeTransferInventoryOrderEntity.getStatus();
+        if(status != 0 && status != 2 ){
+            return R.error("该转移单不允许推送");
+        }
+
+        // queryDetailByTransferId(transferId)
+        List<Map> transferGoodsDto = storeTransferInventoryOrderDetailService.queryDtoById(transferId);
+
+        storeTransferInventoryOrderEntity.setStatus(3);
 
         Gson gson = new Gson();
+        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
 
         Map<String, String> sParaTemp = new TreeMap<>();
         // 构建request中的data数据
-        Map<String,String> dataParam = new HashMap<>();
-        dataParam.put("merchId","");
-        dataParam.put("merchName","");
-        dataParam.put("thirdPartyMerchCode","");
-        dataParam.put("thirdPartyMerchName","");
-        dataParam.put("merchTransDocSn","");
-        dataParam.put("rollOutShopId","");
-        dataParam.put("rollInShopId","");
-        dataParam.put("billTime","");
-        dataParam.put("item",gson.toJson(detailList));
+        Map<String,Object> dataParam = new HashMap<>();
+        dataParam.put("merchId",storeTransferInventoryOrderEntity.getMerchSn());
+        dataParam.put("merchName",storeTransferInventoryOrderEntity.getMerchName());
+//        dataParam.put("thirdPartyMerchCode","");
+//        dataParam.put("thirdPartyMerchName","");
+        dataParam.put("merchTransDocSn",transferId+"");
+        dataParam.put("rollOutShopId",storeTransferInventoryOrderEntity.getOutStoreSn());
+        dataParam.put("rollInShopId",storeTransferInventoryOrderEntity.getInStoreSn());
+        dataParam.put("billTime",timestamp);
+        dataParam.put("item",transferGoodsDto);
 
 
         sParaTemp.put("data",gson.toJson(dataParam));
         sParaTemp.put("merchId",omsMerchProperties.getMerchSn());
-        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
         sParaTemp.put("timestamp", timestamp);
         // 组装oms请求报文
         Request request = buildRequest(sParaTemp);
@@ -69,12 +94,17 @@ public class KtoOmsController {
         try {
             LOGGER.info("oms的请求报文：" + request);
             responseString = com.kmall.admin.utils.oms.OkHttpUtils.post(request);
+            storeTransferInventoryOrderService.update(storeTransferInventoryOrderEntity);
 
+            return handleResult(responseString,gson);
         } catch (Exception e) {
             e.printStackTrace();
+            storeTransferInventoryOrderEntity.setStatus(2);
+            storeTransferInventoryOrderService.update(storeTransferInventoryOrderEntity);
+            return R.error(e.getMessage());
         }
 
-        return handleResult(responseString,gson);
+
 
     }
 
@@ -98,8 +128,8 @@ public class KtoOmsController {
         String sign = OmsSign.sign(sParaTemp,omsMerchProperties.getMd5Salt());
         sParaTemp.put("sign", sign);
         //构建Request
-        String  url = omsMerchProperties.getQueryInveResponseUrl();
-
+        String  url = omsMerchProperties.getSendTransferUrl();
+        url = "http://127.0.0.1:8680/al/shop/bdd/cb/transgoods";
         return com.kmall.admin.utils.oms.OkHttpUtils.buildRequest(url, JSON.toJSONString(sParaTemp));
     }
 

kmall-admin/src/main/java/com/kmall/admin/controller/oms2kmall/Oms2KmallController.java

@@ -30,6 +30,8 @@ public class Oms2KmallController {
     @Autowired
     private Oms2KmallService oms2KmallService;
 
+
+
     @RequestMapping("/transGoods/notice")
     public R transGoodsNotice(@RequestBody Result result){
 

kmall-admin/src/main/java/com/kmall/admin/dao/ProductStoreRelaDao.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.ProductStoreRelaEntity;
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
 import org.apache.ibatis.annotations.Param;
 import com.kmall.manager.dao.BaseDao;
 
@@ -88,7 +89,7 @@ public interface ProductStoreRelaDao extends BaseDao<ProductStoreRelaEntity> {
 
     List<ProductStoreRelaEntity> queryAllList(@Param("page") Integer page, @Param("pageSize") Integer pageSize);
 
-    void transferInGoods(@Param("shopSn") String shopSn, @Param("list") List list);
+    void transferInGoods(@Param("shopSn") String shopSn, @Param("list") List<StoreTransferInventoryOrderDetailEntity> list);
 
-    void transferOutGoods(@Param("shopSn") String shopSn, @Param("list") List list);
+    void transferOutGoods(@Param("shopSn") String shopSn, @Param("list") List<StoreTransferInventoryOrderDetailEntity> list);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/StoreTransferInventoryOrderDetailDao.java

@@ -1,8 +1,13 @@
 package com.kmall.admin.dao;
 
 
+import com.kmall.admin.dto.TransferGoodsDto;
 import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
 import com.kmall.manager.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 门店库存转移单详情表Dao
@@ -13,4 +18,7 @@ import com.kmall.manager.dao.BaseDao;
  */
 public interface StoreTransferInventoryOrderDetailDao extends BaseDao<StoreTransferInventoryOrderDetailEntity> {
 
+    List<StoreTransferInventoryOrderDetailEntity> queryByTransferId(@Param("transferId") Integer transferId);
+
+    List<Map> queryDtoById(@Param("transferId")Integer transferId);
 }

kmall-admin/src/main/java/com/kmall/admin/dto/TransferGoodsDto.java

@@ -0,0 +1,43 @@
+package com.kmall.admin.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author zhangchuangbiao
+ * @version 1.0
+ * 2021-03-08 17:53
+ */
+public class TransferGoodsDto implements Serializable {
+    private static final long serialVersionUID = 661595212962595315L;
+
+    //SKU
+    private String sku;
+    //数量
+    private int goodsNum;
+    //仓库代码
+    private String wareCode;
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public int getGoodsNum() {
+        return goodsNum;
+    }
+
+    public void setGoodsNum(int goodsNum) {
+        this.goodsNum = goodsNum;
+    }
+
+    public String getWareCode() {
+        return wareCode;
+    }
+
+    public void setWareCode(String wareCode) {
+        this.wareCode = wareCode;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/ProductStoreRelaService.java

@@ -2,6 +2,7 @@ package com.kmall.admin.service;
 
 import com.kmall.admin.dto.StoreGoodsDto;
 import com.kmall.admin.entity.ProductStoreRelaEntity;
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -149,5 +150,5 @@ public interface ProductStoreRelaService {
      */
     List<ProductStoreRelaEntity> queryAllList(Integer page, Integer pageSize);
 
-    void handleTransfer(String transferType, String wayBillResponse, List list);
+    void handleTransfer(String transferType, String wayBillResponse, List<StoreTransferInventoryOrderDetailEntity> list);
 }

kmall-admin/src/main/java/com/kmall/admin/service/StoreTransferInventoryOrderDetailService.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service;
 
 
+import com.kmall.admin.dto.TransferGoodsDto;
 import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
 
 import java.util.List;
@@ -70,4 +71,8 @@ public interface StoreTransferInventoryOrderDetailService {
      * @return 删除条数
      */
     int deleteBatch(Integer[]ids);
+
+    List<StoreTransferInventoryOrderDetailEntity> queryByTransferId(Integer transferId);
+
+    List<Map> queryDtoById(Integer transferId);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -864,7 +864,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
     }
 
     @Override
-    public void handleTransfer(String transferType, String shopSn, List list) {
+    public void handleTransfer(String transferType, String shopSn, List<StoreTransferInventoryOrderDetailEntity> list) {
 
 
         // 处理逻辑
@@ -874,8 +874,6 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             productStoreRelaDao.transferOutGoods(shopSn,list);
         }
 
-
-
     }
 
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/StoreTransferInventoryOrderDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service.impl;
 
 import com.kmall.admin.dao.StoreTransferInventoryOrderDetailDao;
+import com.kmall.admin.dto.TransferGoodsDto;
 import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
 import com.kmall.admin.service.StoreTransferInventoryOrderDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,4 +57,14 @@ public class StoreTransferInventoryOrderDetailServiceImpl implements StoreTransf
     public int deleteBatch(Integer[]ids) {
         return storeTransferInventoryOrderDetailDao.deleteBatch(ids);
     }
+
+    @Override
+    public List<StoreTransferInventoryOrderDetailEntity> queryByTransferId(Integer transferId) {
+        return storeTransferInventoryOrderDetailDao.queryByTransferId(transferId);
+    }
+
+    @Override
+    public List<Map> queryDtoById(Integer transferId) {
+        return storeTransferInventoryOrderDetailDao.queryDtoById(transferId);
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/oms2kmall/Oms2KmallServiceImpl.java

@@ -1,7 +1,11 @@
 package com.kmall.admin.service.impl.oms2kmall;
 
 import com.kmall.admin.controller.oms2kmall.Oms2KmallController;
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
+import com.kmall.admin.entity.StoreTransferInventoryOrderEntity;
 import com.kmall.admin.service.ProductStoreRelaService;
+import com.kmall.admin.service.StoreTransferInventoryOrderDetailService;
+import com.kmall.admin.service.StoreTransferInventoryOrderService;
 import com.kmall.admin.service.oms2kmall.Oms2KmallService;
 import com.kmall.admin.utils.oms.response.TransferResponse;
 import com.kmall.common.constant.Dict;
@@ -28,25 +32,38 @@ public class Oms2KmallServiceImpl implements Oms2KmallService {
     @Autowired
     private ProductStoreRelaService productStoreRelaService;
 
-    // TODO 注入查询转移单
-    // TODO 注入查询转移单明细
+    // 注入查询转移单
+    @Autowired
+    private StoreTransferInventoryOrderService storeTransferInventoryOrderService ;
+
+    // 注入查询转移单明细
+    @Autowired
+    private StoreTransferInventoryOrderDetailService storeTransferInventoryOrderDetailService;
 
     @Transactional
     public R transGoodsNotice(TransferResponse wayBillResponse){
-
+        LOGGER.info("转移单审核通过："+wayBillResponse);
         try {
             // 解析数据，回去转移订单号
-            String merchTransDocSn = wayBillResponse.getMerchTransDocSn();
+            Integer merchTransDocSn = wayBillResponse.getMerchTransDocSn();
 
-            // TODO 查询该转移单，是否处理过
-            // TODO 查询转移订单明细，开始转移门店的库存
-            List list = new ArrayList<>();
+            // 查询该转移单，是否处理过
+            StoreTransferInventoryOrderEntity storeTransferInventoryOrder = storeTransferInventoryOrderService.queryObject(merchTransDocSn);
+            if(1 == storeTransferInventoryOrder.getStatus()){
+                LOGGER.error("该转移单已经处理过，转移单编号："+merchTransDocSn);
+                return R.error("该转移单已经处理过，转移单编号："+merchTransDocSn);
+            }
+            // 查询转移订单明细，开始转移门店的库存
+            List<StoreTransferInventoryOrderDetailEntity> list = storeTransferInventoryOrderDetailService.queryByTransferId(merchTransDocSn);
             // 先转出
             productStoreRelaService.handleTransfer(Dict.transferType.in.getItem(),wayBillResponse.getRollOutShopId(),list);
             // 再转入
             productStoreRelaService.handleTransfer(Dict.transferType.out.getItem(),wayBillResponse.getRollInShopId(),list);
 
-            return R.ok("处理成功");
+            storeTransferInventoryOrder.setStatus(1);
+            storeTransferInventoryOrderService.update(storeTransferInventoryOrder);
+
+            return R.ok("处理成功,转移单编号："+merchTransDocSn);
         } catch (Exception e) {
             e.printStackTrace();
             return R.error(e.getMessage());

kmall-admin/src/main/java/com/kmall/admin/utils/oms/response/TransferResponse.java

@@ -16,7 +16,7 @@ public class TransferResponse implements Serializable {
     private String shopNotiType;
     private String shopNotiStatus;
     private String shopNotiInfo;
-    private String merchTransDocSn;
+    private Integer merchTransDocSn;
     private String rollOutShopId;
     private String rollInShopId;
 
@@ -77,11 +77,11 @@ public class TransferResponse implements Serializable {
         this.shopNotiInfo = shopNotiInfo;
     }
 
-    public String getMerchTransDocSn() {
+    public Integer getMerchTransDocSn() {
         return merchTransDocSn;
     }
 
-    public void setMerchTransDocSn(String merchTransDocSn) {
+    public void setMerchTransDocSn(Integer merchTransDocSn) {
         this.merchTransDocSn = merchTransDocSn;
     }
 
@@ -100,4 +100,20 @@ public class TransferResponse implements Serializable {
     public void setRollInShopId(String rollInShopId) {
         this.rollInShopId = rollInShopId;
     }
+
+    @Override
+    public String toString() {
+        return "TransferResponse{" +
+                "shopNotiId='" + shopNotiId + '\'' +
+                ", merchId='" + merchId + '\'' +
+                ", thirdPartyMerchCode='" + thirdPartyMerchCode + '\'' +
+                ", shopNotiTime='" + shopNotiTime + '\'' +
+                ", shopNotiType='" + shopNotiType + '\'' +
+                ", shopNotiStatus='" + shopNotiStatus + '\'' +
+                ", shopNotiInfo='" + shopNotiInfo + '\'' +
+                ", merchTransDocSn=" + merchTransDocSn +
+                ", rollOutShopId='" + rollOutShopId + '\'' +
+                ", rollInShopId='" + rollInShopId + '\'' +
+                '}';
+    }
 }

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -875,7 +875,7 @@
         <foreach collection="list" item="item" index="index" separator=";">
             update mall_product_store_rela
             <set>
-                stock_num = stock_num + #{item.shopNum,jdbcType=INTEGER}
+                stock_num = stock_num + #{item.num,jdbcType=INTEGER}
             </set>
             where
             shop_sn = #{shopSn,jdbcType=VARCHAR}
@@ -888,7 +888,7 @@
         <foreach collection="list" item="item" index="index" separator=";">
             update mall_product_store_rela
             <set>
-                stock_num = stock_num - #{item.shopNum,jdbcType=INTEGER}
+                stock_num = stock_num - #{item.num,jdbcType=INTEGER}
             </set>
             where
             shop_sn = #{shopSn,jdbcType=VARCHAR}

kmall-admin/src/main/resources/mybatis/mapper/StoreTransferInventoryOrderDetailDao.xml

@@ -55,7 +55,7 @@
 			limit #{offset}, #{limit}
 		</if>
 	</select>
-	
+
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall_store_transfer_inventory_order_detail
 		WHERE 1=1
@@ -63,7 +63,7 @@
             AND name LIKE concat('%',#{name},'%')
         </if>
 	</select>
-	 
+
 	<insert id="save" parameterType="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity" useGeneratedKeys="true" keyProperty="id">
 		insert into mall_store_transfer_inventory_order_detail(
 			`order_id`,
@@ -82,9 +82,9 @@
 			#{modifyTime},
 			#{modifySn})
 	</insert>
-	 
+
 	<update id="update" parameterType="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity">
-		update mall_store_transfer_inventory_order_detail 
+		update mall_store_transfer_inventory_order_detail
 		<set>
 			<if test="orderId != null">`order_id` = #{orderId}, </if>
 			<if test="sku != null">`sku` = #{sku}, </if>
@@ -96,16 +96,40 @@
 		</set>
 		where id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		delete from mall_store_transfer_inventory_order_detail where id = #{value}
 	</delete>
-	
+
 	<delete id="deleteBatch">
-		delete from mall_store_transfer_inventory_order_detail where id in 
+		delete from mall_store_transfer_inventory_order_detail where id in
 		<foreach item="id" collection="array" open="(" separator="," close=")">
 			#{id}
 		</foreach>
 	</delete>
 
-</mapper>
+	<select id="queryByTransferId" resultType="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity">
+		select
+    		`id`,
+    		`order_id`,
+    		`sku`,
+    		`num`,
+    		`remark`,
+    		`create_sn`,
+    		`modify_time`,
+    		`modify_sn`
+		from mall_store_transfer_inventory_order_detail
+		where order_id = #{transferId}
+	</select>
+
+	<select id="queryDtoById" resultType="java.util.HashMap">
+		select
+
+    		sku,
+    		num as goodsNum
+		from mall_store_transfer_inventory_order_detail
+		where order_id = #{transferId}
+	</select>
+
+
+</mapper>

kmall-manager/src/main/java/com/kmall/manager/manager/merch/OmsMerchProperties.java

@@ -33,6 +33,7 @@ public class OmsMerchProperties implements Serializable {
 
     private String addPdProductListUrl;
 
+    private String sendTransferUrl;
 
     public String getAddPdProductListUrl() {
         return addPdProductListUrl;
@@ -121,4 +122,12 @@ public class OmsMerchProperties implements Serializable {
     public void setQueryInveResponseUrl(String queryInveResponseUrl) {
         this.queryInveResponseUrl = queryInveResponseUrl;
     }
+
+    public String getSendTransferUrl() {
+        return sendTransferUrl;
+    }
+
+    public void setSendTransferUrl(String sendTransferUrl) {
+        this.sendTransferUrl = sendTransferUrl;
+    }
 }

kmall-manager/src/main/resources/conf/oms-merch.properties

@@ -11,6 +11,7 @@ merch.thirdSn=CW001
 #\u67E5\u8BE2\u8BA2\u5355\u5730\u5740
 merch.queryOrderUrl=http://ws.ds-bay.com/al/shop/order/query
 merch.queryInveResponseUrl=http://ws.ds-bay.com/al/queryInveResponse
+merch.sendTransferUrl=http://ws.ds-bay.com/al/shop/bdd/cb/transgoods
 #ccnet\u751F\u4EA7\u73AF\u5883\u67E5\u8BE2\u652F\u4ED8\u5355\u3001\u7535\u5B50\u8BA2\u5355\u3001\u8FD0\u5355\u5931\u8D25\u8BA2\u5355\u63A5\u53E3
 merch.wxOrderResendUrl=http://8.135.102.238:8680/wx/wxOrderResendQueryAll
 

kmall-manager/src/main/resources/spring/spring-oms-merch.xml

@@ -27,5 +27,6 @@
         <property name="queryOrderUrl" value="${merch.queryOrderUrl}"/>
         <property name="queryInveResponseUrl" value="${merch.queryInveResponseUrl}"/>
         <property name="addPdProductListUrl" value="${merch.addPdProductListUrl}"/>
+        <property name="sendTransferUrl" value="${merch.sendTransferUrl}"/>
     </bean>
 </beans>