维多利亚

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

@@ -53,6 +53,11 @@ public class OrderInfo extends BaseEntity {
     private Integer status;
 
     /**
+     * 出库状态 1未出库2进行中3已出库
+     */
+    private Integer issueStatus;
+
+    /**
      * 国家
      */
     private String countryId;

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

@@ -0,0 +1,23 @@
+package com.fjhx.params.order;
+
+import lombok.Data;
+
+@Data
+public class IssueVo {
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 类型：1、京东订单出库 2、销售订单出库
+     */
+    private Integer type;
+
+}

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

@@ -1,5 +1,6 @@
 package com.fjhx.controller.order;
 
+import com.fjhx.params.order.IssueVo;
 import com.fjhx.params.order.OrderDetailsEx;
 import com.fjhx.service.order.OrderDetailsService;
 import org.springblade.core.tool.api.R;
@@ -33,5 +34,11 @@ public class OrderDetailsController {
         return R.success(result);
     }
 
+    @PostMapping("/issue")
+    public R issue(@RequestBody IssueVo issueVo) {
+        orderDetailsService.issue(issueVo);
+        return R.success();
+    }
+
 }
 

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

@@ -33,6 +33,14 @@ 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);

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

@@ -29,7 +29,14 @@ public class OrderSalesController {
     private OrderInfoService orderInfoService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition){
+    public R page(@RequestBody Map<String, Object> condition) {
+        Page<OrderInfoEx> result = orderInfoService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/issuePage")
+    public R issuePage(@RequestBody Map<String, Object> condition) {
+        condition.put("deliverable", true);
         Page<OrderInfoEx> result = orderInfoService.getPage(condition);
         return R.success(result);
     }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderDetailsMapper.xml

@@ -3,19 +3,20 @@
 <mapper namespace="com.fjhx.mapper.order.OrderDetailsMapper">
 
     <select id="listByOrderSalesId" resultType="com.fjhx.params.order.OrderDetailsEx">
-        select osd.id,
-               osd.order_id,
-               osd.product_id,
-               osd.quantity,
-               osd.not_issued_quantity,
-               osd.price,
-               osd.remark,
+        select od.id,
+               od.order_id,
+               od.product_id,
+               od.quantity,
+               od.not_issued_quantity,
+               od.price,
+               od.remark,
                pi.name  productName,
                pi.code  productCode,
                pi.specs productSpecs,
                pi.unit  productUnit
-        from order_details osd
-                 left join product_info pi on osd.product_id = pi.id
+        from order_details od
+                 left join product_info pi on od.product_id = pi.id
             ${ew.customSqlSegment}
     </select>
+
 </mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderInfoMapper.xml

@@ -10,6 +10,7 @@
                oi.amount_money,
                oi.order_time,
                oi.status,
+               oi.issue_status,
                oi.country_id,
                oi.province_id,
                oi.city_id,

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

@@ -2,6 +2,7 @@ package com.fjhx.service.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.order.OrderDetails;
+import com.fjhx.params.order.IssueVo;
 import com.fjhx.params.order.OrderDetailsEx;
 import com.fjhx.params.order.OrderDetailsVo;
 import com.fjhx.base.BaseService;
@@ -29,4 +30,6 @@ public interface OrderDetailsService extends BaseService<OrderDetails> {
 
     List<OrderDetailsEx> listByOrderSalesId(Map<String, Object> condition);
 
+    void issue(IssueVo issueVo);
+
 }

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

@@ -1,12 +1,14 @@
 package com.fjhx.service.order.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.order.OrderDetails;
+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.mapper.order.OrderDetailsMapper;
 import com.fjhx.service.order.OrderDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.Assert;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import org.springframework.stereotype.Service;
 
@@ -49,10 +51,17 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
 
     @Override
     public List<OrderDetailsEx> listByOrderSalesId(Map<String, Object> condition) {
+        Assert.notEmpty(condition.get("orderId"), "订单id不能为空");
+
         IWrapper<Object> wrapper = IWrapper.getWrapper(condition)
                 .eq("od", OrderDetails::getOrderId);
 
         return baseMapper.listByOrderSalesId(wrapper);
     }
 
+    @Override
+    public void issue(IssueVo issueVo) {
+
+    }
+
 }

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

@@ -66,6 +66,7 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
 
         IWrapper<Object> wrapper = IWrapper.getWrapper(condition)
                 .keyword(new KeywordData("oi", OrderInfo::getCode), new KeywordData("ci", CustomerInfo::getName))
+                // 京东订单销售订单
                 .func(q -> {
                     Integer type = Convert.toInt(condition.get("type"));
                     if (type == null) {
@@ -74,6 +75,14 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
                         q.eq("oi", OrderInfo::getType);
                     }
                 })
+                // 搜索可以出库的列表
+                .func(q -> {
+                    Boolean issue = Convert.toBool(condition.get("deliverable"));
+                    if (Boolean.TRUE.equals(issue)) {
+                        q.eq("oi", OrderInfo::getStatus, 1);
+                        q.lt("oi", OrderInfo::getIssueStatus, 3);
+                    }
+                })
                 .eq("oi", OrderInfo::getStatus)
                 .like("oi", OrderInfo::getCode)
                 .like("ci", CustomerInfo::getName, condition.get("customerName"))

hx-service/weixin/src/main/java/com/fjhx/constants/WeChatConstants.java

@@ -12,5 +12,4 @@ public interface WeChatConstants {
 
     String ENCODING_AES_KEY = "1FGEMocxFTMBzc6UKobgcv8R2uk3OQDEuFGihjXLOaf";
 
-
 }