维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/constants/SystemConfigKeyConstant.java

@@ -2,7 +2,14 @@ package com.fjhx.constants;
 
 public interface SystemConfigKeyConstant {
 
-    // 京东客户id
-    String CUSTOMER_CUSTOMER_ID = "customer_customer_id";
+    /**
+     * 京东客户id
+     */
+    String JD_CUSTOMER_ID = "jd_customer_id";
+
+    /**
+     * 京东仓库id
+     */
+    String JD_WAREHOUSE_ID = "jd_warehouse_id";
 
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/OrderInfo.java

@@ -107,6 +107,17 @@ public class OrderInfo extends BaseEntity {
      */
     private String remark;
 
+
+    /**
+     * 配送中心
+     */
+    private String distributionCenter;
+
+    /**
+     * 京东仓库
+     */
+    private String jdWarehouse;
+
     /**
      * 逻辑删除 0未删除 1已删除
      */

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderJdExcelVo.java

@@ -36,4 +36,10 @@ public class OrderJdExcelVo extends BaseExcelVo {
     @ExcelProperty("订购时间")
     private Date orderTime;
 
+    @ExcelProperty("配送中心")
+    private String distributionCenter;
+
+    @ExcelProperty("京东仓库")
+    private String jdWarehouse;
+
 }

hx-service/victoriatourist/src/main/java/com/fjhx/controller/order/OrderJdController.java

@@ -1,8 +1,11 @@
 package com.fjhx.controller.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.enums.stock.OutTypeEnum;
+import com.fjhx.params.order.IssueVo;
 import com.fjhx.params.order.OrderInfoEx;
 import com.fjhx.params.order.OrderInfoVo;
+import com.fjhx.service.order.OrderDetailsService;
 import com.fjhx.service.order.OrderInfoService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +29,9 @@ public class OrderJdController {
     @Autowired
     private OrderInfoService orderInfoService;
 
+    @Autowired
+    private OrderDetailsService orderDetailsService;
+
     @PostMapping("/page")
     public R page(@RequestBody Map<String, Object> condition) {
         condition.put("type", 3);
@@ -33,14 +39,6 @@ public class OrderJdController {
         return R.success(result);
     }
 
-    @PostMapping("/issuePage")
-    public R issuePage(@RequestBody Map<String, Object> condition) {
-        condition.put("type", 3);
-        condition.put("deliverable", true);
-        Page<OrderInfoEx> result = orderInfoService.getPage(condition);
-        return R.success(result);
-    }
-
     @PostMapping("/add")
     public R add(@RequestBody OrderInfoVo orderInfoVo) {
         orderInfoVo.setType(3);
@@ -60,5 +58,26 @@ public class OrderJdController {
         return R.data(flag);
     }
 
+    /**
+     * 出库分页列表
+     */
+    @PostMapping("/issuePage")
+    public R issuePage(@RequestBody Map<String, Object> condition) {
+        condition.put("type", 3);
+        condition.put("deliverable", true);
+        Page<OrderInfoEx> result = orderInfoService.getPage(condition);
+        return R.success(result);
+    }
+
+    /**
+     * 京东出库
+     */
+    @PostMapping("/issue")
+    public R issue(@RequestBody IssueVo issueVo) {
+        issueVo.setOutTypeEnum(OutTypeEnum.JD);
+        orderDetailsService.issue(issueVo);
+        return R.success();
+    }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/StockTransferController.java

@@ -50,7 +50,5 @@ public class StockTransferController {
         return R.success();
     }
 
-
-
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderDetailsServiceImpl.java

@@ -4,18 +4,24 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.constants.SystemConfigKeyConstant;
 import com.fjhx.entity.logistics.LogisticsInfo;
 import com.fjhx.entity.order.OrderDetails;
 import com.fjhx.entity.order.OrderInfo;
+import com.fjhx.enums.stock.OutTypeEnum;
 import com.fjhx.mapper.order.OrderDetailsMapper;
 import com.fjhx.params.order.IssueVo;
 import com.fjhx.params.order.OrderDetailsEx;
 import com.fjhx.params.order.OrderDetailsVo;
+import com.fjhx.params.stock.ChangeProduct;
 import com.fjhx.params.stock.StockChangeVo;
+import com.fjhx.params.stock.StockTransferAddVo;
 import com.fjhx.service.logistics.LogisticsInfoService;
 import com.fjhx.service.order.OrderDetailsService;
 import com.fjhx.service.order.OrderInfoService;
 import com.fjhx.service.stock.StockService;
+import com.fjhx.service.stock.StockTransferService;
+import com.fjhx.service.system.SystemConfigService;
 import com.fjhx.uitl.kd100.KD100Util;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.wrapperUtil.IWrapper;
@@ -51,6 +57,13 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
     @Autowired
     private StockService stockService;
 
+    @Autowired
+    private StockTransferService stockTransferService;
+
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+
     @Override
     public Page<OrderDetails> getPage(Map<String, Object> condition) {
 
@@ -118,14 +131,22 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
 
             // 修改订单状态
             OrderInfo orderInfo = orderInfoService.getById(orderId);
+
+            // 如果是京东出库
+            if (issueVo.getOutTypeEnum().equals(OutTypeEnum.JD)) {
+                orderInfo.setStatus(2);
+                orderInfo.setIssueStatus(3);
+            }
             // 如果是退换货或者补发，出库一次算完成
-            if (orderInfo.getType() == 5) {
+            else if (orderInfo.getType() == 5) {
                 orderInfo.setIssueStatus(3);
                 // 补发跟进中变已补发
                 if (orderInfo.getAfterSalesStatus() == 1) {
                     orderInfo.setAfterSalesStatus(2);
                 }
-            } else if (orderInfo.getType() == 6) {
+            }
+            // 如果是线下退换货
+            else if (orderInfo.getType() == 6) {
                 orderInfo.setIssueStatus(3);
                 switch (orderInfo.getAfterSalesStatus()) {
                     // 未补发未收到退货变已补发未收到退货
@@ -172,6 +193,28 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         stockChangeVo.setTypeEnum(issueVo.getOutTypeEnum());
         stockChangeVo.setChangeDetailsList(orderDetailsList);
 
+        // 京东出库新增调仓
+        if (issueVo.getOutTypeEnum().equals(OutTypeEnum.JD)) {
+            // 获取京东仓库id
+            Long jdWarehouseId = systemConfigService.getValue(SystemConfigKeyConstant.JD_WAREHOUSE_ID, Long.class);
+
+            StockTransferAddVo stockTransferAddVo = new StockTransferAddVo();
+            stockTransferAddVo.setOutWarehouseId(issueVo.getWarehouseId());
+            stockTransferAddVo.setInWarehouseId(jdWarehouseId);
+            stockTransferAddVo.setRemark("京东出库");
+            // ChangeProduct.
+
+            List<ChangeProduct> changeProductList = issueVo.getOrderDetailsList().stream().map(item -> {
+                ChangeProduct changeProduct = new ChangeProduct();
+                changeProduct.setProductId(item.getProductId());
+                changeProduct.setQuantity(item.getChangeQuantity());
+                return changeProduct;
+            }).collect(Collectors.toList());
+
+            stockTransferAddVo.setChangeProductList(changeProductList);
+            stockTransferService.add(stockTransferAddVo);
+        }
+
         stockService.changeQuantity(stockChangeVo);
     }
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderInfoInfoServiceImpl.java

@@ -132,8 +132,8 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
         Integer type = orderVo.getType();
         if (type == 3) {
             // 获取京东客户id
-            Long customerCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.CUSTOMER_CUSTOMER_ID, Long.class);
-            orderVo.setCustomerInfoId(customerCustomerId);
+            Long jdCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.JD_CUSTOMER_ID, Long.class);
+            orderVo.setCustomerInfoId(jdCustomerId);
         }
 
         // 订单时间
@@ -181,7 +181,7 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
         List<OrderJdExcelVo> list = ExcelUtil.read(file, OrderJdExcelVo.class);
 
         // 获取京东客户id
-        Long customerCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.CUSTOMER_CUSTOMER_ID, Long.class);
+        Long jdCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.JD_CUSTOMER_ID, Long.class);
 
         // 验证订单编号是否重复
         verifyOrderNumber(list);
@@ -215,7 +215,7 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
                 long id = IdWorker.getId();
                 orderInfo.setId(id);
                 orderInfo.setType(3);
-                orderInfo.setCustomerInfoId(customerCustomerId);
+                orderInfo.setCustomerInfoId(jdCustomerId);
                 orderInfo.setCode(code);
                 orderInfo.setAmountMoney(price.multiply(quantity));
                 orderInfo.setOrderTime(orderJdExcelVo.getOrderTime());
@@ -227,6 +227,9 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
                 orderInfo.setExcelImportId(flag);
                 orderInfo.setCreateUser(AuthUtil.getUserId());
                 orderInfo.setCreateTime(date);
+                orderInfo.setDistributionCenter(orderJdExcelVo.getDistributionCenter());
+                orderInfo.setJdWarehouse(orderJdExcelVo.getJdWarehouse());
+
                 map.put(code, orderInfo);
             } else {
                 orderInfo.setAmountMoney(orderInfo.getAmountMoney().add(price.multiply(quantity)));