快递100集成

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

@@ -9,9 +9,9 @@ public interface LogisticsConstant {
      * 状态
      */
     class Status {
-        //未完成
+        //未完成 / 未到货
         public static final Integer STATUS_0 = 0;
-        //已完成
+        //已完成 / 已到货
         public static final Integer STATUS_1 = 1;
     }
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/apply/ApplyPurchase.java

@@ -64,7 +64,7 @@ public class ApplyPurchase extends BaseEntity {
     private Long receiptWarehouseId;
 
     /**
-     * 状态：10、待采购；20、审批中；30、待发货；40、已发货；50、已完成
+     * 状态：10、待采购；20、已驳回；30、采购审批中；40、已采购；50、已完成
      */
     private Integer status;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/logistics/LogisticsInfo.java

@@ -43,7 +43,7 @@ public class LogisticsInfo extends BaseEntity {
     private String code;
 
     /**
-     * 完成状态 1是 0否
+     * 状态：0、未完成 / 未到货；1、已完成 / 已到货
      */
     private Integer status;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/purchase/Purchase.java

@@ -39,7 +39,7 @@ public class Purchase extends BaseEntity {
     private BigDecimal price;
 
     /**
-     * 状态：10、审批中；20、驳回；30、待发货；40、已发货；50、已完成
+     * 状态：10、审批中；20、驳回；30、未到货；40、部分到货；50、已到货；99、取消
      */
     private Integer status;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/apply/ApplyPurchaseStatusEnum.java

@@ -12,9 +12,9 @@ import java.util.Map;
  */
 public enum ApplyPurchaseStatusEnum {
     STATUS_10(10, "待采购"),
-    STATUS_20(20, "审批中"),
-    STATUS_30(30, "待发货"),
-    STATUS_40(40, "已发货"),
+    STATUS_20(20, "采购审批中"),
+    STATUS_30(30, "已驳回"),
+    STATUS_40(40, "已采购"),
     STATUS_50(50, "已完成"),
     ;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/purchase/PurchaseStatusEnum.java

@@ -13,9 +13,10 @@ import java.util.Map;
 public enum PurchaseStatusEnum {
     STATUS_10(10, "审批中"),
     STATUS_20(20, "驳回"),
-    STATUS_30(30, "待发货"),
-    STATUS_40(40, "已发货"),
-    STATUS_50(50, "已完成"),
+    STATUS_30(30, "未到货"),
+    STATUS_40(40, "部分到货"),
+    STATUS_50(50, "已到货"),
+    STATUS_99(99, "已取消"),
     ;
 
     private int key;

hx-service/victoriatourist/src/main/java/com/fjhx/controller/logistics/LogisticsInfoController.java

@@ -37,9 +37,15 @@ public class LogisticsInfoController {
         return R.success(result);
     }
 
+    /**
+     * 发货通知
+     *
+     * @param entity
+     * @return
+     */
     @PostMapping("/add")
-    public R add(@RequestBody LogisticsInfoVo logisticsInfoVo) {
-        logisticsInfoService.add(logisticsInfoVo);
+    public R add(@RequestBody LogisticsInfoVo entity) {
+        logisticsInfoService.add(entity);
         return R.success();
     }
 
@@ -61,5 +67,28 @@ public class LogisticsInfoController {
         return R.success(list);
     }
 
+    /**
+     * 查询物流单号下拉款
+     *
+     * @param entity
+     * @return
+     */
+    @PostMapping("/code/select")
+    public R codeSelect(@RequestBody LogisticsInfoVo entity) {
+        return R.success(logisticsInfoService.codeSelectByBusinessId(entity.getBusinessId()));
+    }
+
+    /**
+     * 到货通知
+     *
+     * @param entity
+     * @return
+     */
+    @PostMapping("/arrival/notice")
+    public R arrivalNotice(@RequestBody LogisticsInfoVo entity) {
+        entity.setStatus(LogisticsConstant.Status.STATUS_1);
+        return R.success(logisticsInfoService.updateById(entity));
+    }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/purchase/PurchaseController.java

@@ -3,6 +3,7 @@ package com.fjhx.controller.purchase;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.entity.purchase.Purchase;
+import com.fjhx.enums.purchase.PurchaseStatusEnum;
 import com.fjhx.service.purchase.PurchaseService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,19 @@ public class PurchaseController {
     private PurchaseService purchaseService;
 
     /**
-     * 待发货列表
+     * 待采购列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/stay/purchase/page")
+    public R stayPurchasePage(@RequestBody Map<String, Object> condition) {
+        Page<ApplyPurchase> result = purchaseService.stayPurchasePage(condition);
+        return R.success(result);
+    }
+
+    /**
+     * 已采购列表
      *
      * @param condition 查询条件
      * @return
@@ -41,26 +54,26 @@ public class PurchaseController {
     }
 
     /**
-     * 待采购列表
+     * 取消
      *
-     * @param condition 查询条件
+     * @param entity
      * @return
      */
-    @PostMapping("/stay/purchase/page")
-    public R stayPurchasePage(@RequestBody Map<String, Object> condition) {
-        Page<ApplyPurchase> result = purchaseService.stayPurchasePage(condition);
-        return R.success(result);
+    @PostMapping("/cancel")
+    public R cancel(@RequestBody Purchase entity) {
+        purchaseService.cancelOrEnd(entity.getId(), PurchaseStatusEnum.STATUS_99.getKey());
+        return R.success();
     }
 
     /**
-     * 完成
+     * 结束
      *
      * @param entity
      * @return
      */
-    @PostMapping("/complete")
-    public R complete(@RequestBody Purchase entity) {
-        purchaseService.complete(entity.getId());
+    @PostMapping("/end")
+    public R end(@RequestBody Purchase entity) {
+        purchaseService.cancelOrEnd(entity.getId(), PurchaseStatusEnum.STATUS_50.getKey());
         return R.success();
     }
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/apply/impl/ApplyPurchaseServiceImpl.java

@@ -29,7 +29,12 @@ import org.springframework.stereotype.Service;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/LogisticsInfoService.java

@@ -49,4 +49,12 @@ public interface LogisticsInfoService extends BaseService<LogisticsInfo> {
      * @param state 物流状态
      */
     void updateStatusByCode(String code, Integer state);
+
+    /**
+     * 根据业务ID查询物流单号
+     *
+     * @param businessId 业务ID
+     * @return
+     */
+    List<LogisticsInfo> codeSelectByBusinessId(Long businessId);
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -127,4 +127,20 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
     public void updateStatusByCode(String code, Integer state) {
         lambdaUpdate().set(LogisticsInfo::getStatus, state).eq(LogisticsInfo::getCode, code).update();
     }
+
+    /**
+     * 根据业务ID查询物流单号
+     *
+     * @param businessId 业务ID
+     * @return
+     */
+    @Override
+    public List<LogisticsInfo> codeSelectByBusinessId(Long businessId) {
+        return lambdaQuery()
+                .select(LogisticsInfo::getId, LogisticsInfo::getCode)
+                .eq(LogisticsInfo::getBusinessType, 1)
+                .eq(LogisticsInfo::getBusinessId, businessId)
+                .eq(LogisticsInfo::getStatus, LogisticsConstant.Status.STATUS_0)
+                .list();
+    }
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/purchase/PurchaseService.java

@@ -18,20 +18,20 @@ import java.util.Map;
 public interface PurchaseService extends BaseService<Purchase> {
 
     /**
-     * 待发货列表
+     * 待采购列表
      *
      * @param condition 查询条件
      * @return
      */
-    Page<Purchase> getPage(Map<String, Object> condition);
+    Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition);
 
     /**
-     * 待采购列表
+     * 已采购列表
      *
      * @param condition 查询条件
      * @return
      */
-    Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition);
+    Page<Purchase> getPage(Map<String, Object> condition);
 
     /**
      * 获取审批详情
@@ -42,9 +42,10 @@ public interface PurchaseService extends BaseService<Purchase> {
     Purchase getFlowDetailsById(Long id);
 
     /**
-     * 完成采购
+     * 取消 或 结束
      *
-     * @param id 采购ID
+     * @param id     采购ID
+     * @param status 采购状态
      */
-    void complete(Long id);
+    void cancelOrEnd(Long id, Integer status);
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/purchase/impl/PurchaseFlowServiceImpl.java

@@ -79,7 +79,7 @@ public class PurchaseFlowServiceImpl implements PurchaseFlowService {
                         //修改采购状态
                         purchaseService.lambdaUpdate().set(Purchase::getStatus, PurchaseStatusEnum.STATUS_30.getKey()).eq(Purchase::getId, id).update();
                         //修改申购状态
-                        applyPurchaseService.lambdaUpdate().set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_30.getKey()).eq(ApplyPurchase::getPurchaseId, id).update();
+                        applyPurchaseService.lambdaUpdate().set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_40.getKey()).eq(ApplyPurchase::getPurchaseId, id).update();
                     }
 
                     /**
@@ -106,10 +106,10 @@ public class PurchaseFlowServiceImpl implements PurchaseFlowService {
                         purchaseService.lambdaUpdate().set(Purchase::getStatus, PurchaseStatusEnum.STATUS_20.getKey()).set(Purchase::getDelFlag, CommonConstant.YesOrNo.YES).eq(Purchase::getId, id).update();
                         //修改申购状态
                         applyPurchaseService.lambdaUpdate()
-                                .set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_10.getKey())
-                                .set(ApplyPurchase::getUnitPrice, null)
-                                .set(ApplyPurchase::getPurchaseId, null)
-                                .set(ApplyPurchase::getPurchaseCode, null)
+                                .set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_30.getKey())
+//                                .set(ApplyPurchase::getUnitPrice, null)
+//                                .set(ApplyPurchase::getPurchaseId, null)
+//                                .set(ApplyPurchase::getPurchaseCode, null)
                                 .eq(ApplyPurchase::getPurchaseId, id)
                                 .update();
                         return true;

hx-service/victoriatourist/src/main/java/com/fjhx/service/purchase/impl/PurchaseServiceImpl.java

@@ -41,7 +41,18 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
     private LogisticsInfoService logisticsInfoService;
 
     /**
-     * 待发货列表
+     * 待采购列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @Override
+    public Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition) {
+        return applyPurchaseService.stayPurchasePage(condition);
+    }
+
+    /**
+     * 已采购列表
      *
      * @param condition 查询条件
      * @return
@@ -82,17 +93,6 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
     }
 
     /**
-     * 待采购列表
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @Override
-    public Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition) {
-        return applyPurchaseService.stayPurchasePage(condition);
-    }
-
-    /**
      * 获取审批详情
      *
      * @param id 采购ID
@@ -112,15 +112,16 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
     }
 
     /**
-     * 完成采购
+     * 取消 或 结束
      *
-     * @param id 采购ID
+     * @param id     采购ID
+     * @param status 采购状态
      */
     @Transactional(rollbackFor = {Exception.class})
     @Override
-    public void complete(Long id) {
+    public void cancelOrEnd(Long id, Integer status) {
         //修改采购状态
-        lambdaUpdate().set(Purchase::getStatus, PurchaseStatusEnum.STATUS_50.getKey()).eq(Purchase::getId, id).update();
+        lambdaUpdate().set(Purchase::getStatus, status).eq(Purchase::getId, id).update();
         //修改申购状态
         applyPurchaseService.lambdaUpdate().set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_50.getKey()).eq(ApplyPurchase::getPurchaseId, id).update();
     }