接收转移通知请求逻辑修改

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

@@ -129,7 +129,7 @@ public class KtoOmsController {
         sParaTemp.put("sign", sign);
         //构建Request
         String  url = omsMerchProperties.getSendTransferUrl();
-        url = "http://127.0.0.1:8680/al/shop/bdd/cb/transgoods";
+        url = "http://183.3.221.143: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/service/impl/OrderServiceImpl.java

@@ -2130,29 +2130,29 @@ public class OrderServiceImpl implements OrderService {
             // 设置支付单开始时间
             processRecordEntity.setPaymentStartTime(new Date());
             // 判断是微信的支付码还是支付宝的支付码
-            if (parCode.startsWith("28")) {
-                // 支付宝支付
-                try {
-                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw e;
-                }
-            } else {
-                // 微信支付
-                try {
-                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw e;
-                }
-            }
+//            if (parCode.startsWith("28")) {
+//                // 支付宝支付
+//                try {
+//                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    throw e;
+//                }
+//            } else {
+//                // 微信支付
+//                try {
+//                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    throw e;
+//                }
+//            }
 
-//            OrderEntity orderEntity = queryObject(order.getId());
-////             TODO 到时候要注释掉，测试用而已
-//            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
-//            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
-//            orderDao.update(orderEntity);
+            OrderEntity orderEntity = queryObject(order.getId());
+//             TODO 到时候要注释掉，测试用而已
+            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
+            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
+            orderDao.update(orderEntity);
             resultObj.put("shopName", store.getStoreName()); // 根据门店编号查询
             resultObj.put("userName", user.getUsername());
 

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

@@ -866,12 +866,15 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
     @Override
     public void handleTransfer(String transferType, String shopSn, List<StoreTransferInventoryOrderDetailEntity> list) {
 
+        // 根据门店编号查询门店id
+        StoreEntity storeEntity = storeDao.queryObjectByNumber(shopSn);
+
 
         // 处理逻辑
         if(Dict.transferType.in.getItem().equals(transferType)){
-            productStoreRelaDao.transferInGoods(shopSn,list);
+            productStoreRelaDao.transferInGoods(storeEntity.getId()+"",list);
         }else if (Dict.transferType.out.getItem().equals(transferType)){
-            productStoreRelaDao.transferOutGoods(shopSn,list);
+            productStoreRelaDao.transferOutGoods(storeEntity.getId()+"",list);
         }
 
     }

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

@@ -57,8 +57,10 @@ public class StoreTransferInventoryOrderServiceImpl implements StoreTransferInve
     @Override
     public int update(StoreTransferInventoryOrderEntity storeTransferInventoryOrder) {
         SysUserEntity userEntity = ShiroUtils.getUserEntity();
-        storeTransferInventoryOrder.setModifySn(userEntity.getUserId() + "");
-        storeTransferInventoryOrder.setModifyTime(new Date());
+        if(userEntity != null) {
+            storeTransferInventoryOrder.setModifySn(userEntity.getUserId() + "");
+            storeTransferInventoryOrder.setModifyTime(new Date());
+        }
         return storeTransferInventoryOrderDao.update(storeTransferInventoryOrder);
     }
 

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

@@ -7,6 +7,7 @@ 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.jackson.JacksonUtil;
 import com.kmall.admin.utils.oms.response.TransferResponse;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.R;
@@ -17,7 +18,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhangchuangbiao
@@ -63,7 +66,24 @@ public class Oms2KmallServiceImpl implements Oms2KmallService {
             storeTransferInventoryOrder.setStatus(1);
             storeTransferInventoryOrderService.update(storeTransferInventoryOrder);
 
-            return R.ok("处理成功,转移单编号："+merchTransDocSn);
+
+            Map<String,String> resultData = new HashMap<>();
+            resultData.put("merchTransDocSn",wayBillResponse.getMerchTransDocSn()+"");
+            resultData.put("rollOutShopId",wayBillResponse.getRollOutShopId());
+            resultData.put("rollInShopId",wayBillResponse.getRollInShopId());
+            resultData.put("shopNotiId",wayBillResponse.getRollInShopId());
+            resultData.put("merchId",wayBillResponse.getRollInShopId());
+
+            List<Map<String,String>> resultList = new ArrayList<>();
+            resultList.add(resultData);
+            Map<String,Object> data = new HashMap<>();
+            data.put("total",resultData.size());
+            data.put("rows", resultList);
+
+            Map<String,Object> map = new HashMap<>();
+            map.put("data",data);
+
+            return R.ok(map);
         } catch (Exception e) {
             e.printStackTrace();
             return R.error(e.getMessage());

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

@@ -878,9 +878,8 @@
                 stock_num = stock_num + #{item.num,jdbcType=INTEGER}
             </set>
             where
-            shop_sn = #{shopSn,jdbcType=VARCHAR}
+            store_id = #{shopSn,jdbcType=VARCHAR}
             and sku = #{item.sku,jdbcType=VARCHAR}
-
         </foreach>
     </update>
 
@@ -891,7 +890,7 @@
                 stock_num = stock_num - #{item.num,jdbcType=INTEGER}
             </set>
             where
-            shop_sn = #{shopSn,jdbcType=VARCHAR}
+            store_id = #{shopSn,jdbcType=VARCHAR}
             and sku = #{item.sku,jdbcType=VARCHAR}
         </foreach>
     </update>