Merge branch 'feature/xgh/2501零散迭代' into 'master'

Feature/xgh/2501零散迭代

See merge request !2523

haoban-manage3-service/src/main/resources/mapper/TabHaobanClerkMainStoreRelatedMapper.xml

@@ -69,7 +69,7 @@
     where staff_id = #{staffId,jdbcType=VARCHAR}
     and wx_enterprise_id = #{wxEnterpriseId}
     and status_flag = 1
-    <if test="null != storeIdList">
+    <if test="null != storeIdList and storeIdList.size != 0">
      and store_id IN
     <foreach collection="storeIdList" open="(" close=")" separator="," item="item">
       #{item}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -187,7 +187,7 @@ public class GicOrderController {
         if (status == 2) {
             qdto.setWriteOffClerkId(clerkId);
             qdto.setOrderStep("4");
-            qdto.setDeliveryOptType(1);
+            //qdto.setDeliveryOptType(1);
         }
         qdto.setSearchOrderParam(search);
         qdto.setBusinessType(businessType);
@@ -256,14 +256,14 @@ public class GicOrderController {
         OrderDetailDTO detail = ret.getResult();
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
         if (ret.isSuccess()) {
-            // 已核销,且不是好办核销的
-            if (null != detail.getOrderInfo().getDeliveryOptType()
-                    && detail.getOrderInfo().getDeliveryOptType() != 1) {
-                logger.info("已核销,且不是好办核销的={}", writeOffCode);
-                return RestResponse.failure("9999", "此自提点无法核销");
+            if(detail.getOrderInfo().getOrderStep()==4 && null != detail.getOrderInfo().getDeliveryOptType()
+                    && !Arrays.asList(1,2).contains(detail.getOrderInfo().getDeliveryOptType())) {
+                logger.info("提货码已核销={}", writeOffCode);
+                return RestResponse.failure("9999", "提货码已核销");
             }
             if (!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
-                return RestResponse.failure("9999", "此自提点无法核销");
+                logger.info("核销门店不符合={}", writeOffCode);
+                return RestResponse.failure("9999", "此自提点无法核销,请确认订单核销门店");
             }
             OrderDetailVO orderDetailVO = this.getOrderDetail(enterpriseId, ret.getResult().getOrderInfo(),
                     ret.getResult().getOrderItemList(), storeId);
@@ -271,7 +271,7 @@ public class GicOrderController {
                 return RestResponse.failure("9999", "核销订单不存在");
             }
             Date pickOverTime = detail.getOrderInfo().getPickUpOverTime() ;
-            if(null != pickOverTime && pickOverTime.before(new Date())) {
+            if(null != pickOverTime && pickOverTime.before(new Date()) && detail.getOrderInfo().getOrderStep()!=4) {
                 return RestResponse.failure("9999", "此订单自提时间已截止");
             }
             return RestResponse.successResult(orderDetailVO);
@@ -397,7 +397,14 @@ public class GicOrderController {
     }
 
     // 修改物流
+    // orderId 下单发货传订单ID  换货发货传换货ID  退款单id
     // type : 1: 下单 2：换货
+    /**
+     * 1: 下单发货
+     * 2：换货发货
+     * 3、退货（买家发货物流信息修改）
+     * 4、换货（买家发货物流信息修改）
+     */
     @RequestMapping("modify-order-logistics")
     public RestResponse<Object> modifyOrderDeliver(String memberId, String enterpriseId, String orderId, String storeId,
             String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,String clerkId ,
@@ -483,7 +490,7 @@ public class GicOrderController {
         qdto.setPickUpStoreId(storeId);
         if (step == 4) {
             qdto.setWriteOffClerkId(clerkId);
-            qdto.setDeliveryOptType(1);
+            //qdto.setDeliveryOptType(1);
         }
         qdto.setOrderStep("" + step);
         qdto.setPageNum(1);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/scan/ScanController.java

@@ -71,6 +71,14 @@ public class ScanController {
         logger.info("订单信息={}", JSON.toJSONString(ret));
         //订单
         if (ret.isSuccess() && detail != null) {
+            if(detail.getOrderInfo().getOrderStep()==4) {
+                logger.info("提货码已核销={}", writeOffCode);
+                return RestResponse.failure("9999", "提货码已核销");
+            }
+            if (!storeId.equals(detail.getOrderInfo().getPickUpStoreId())) {
+                logger.info("核销门店不符合={}", writeOffCode);
+                return RestResponse.failure("9999", "此自提点无法核销,请确认订单核销门店");
+            }
             // 已核销,且不是好办核销的
             if (null != detail.getOrderInfo().getDeliveryOptType()
                     && detail.getOrderInfo().getDeliveryOptType() != 1) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderListVO.java

@@ -107,7 +107,18 @@ public class OrderListVO implements Serializable {
      * 评价
      */
     private EvaluateVO evaluateVO;
-    
+
+    // 2 会员自主核销
+    private Integer deliveryOptType ;
+
+    public Integer getDeliveryOptType() {
+        return deliveryOptType;
+    }
+
+    public void setDeliveryOptType(Integer deliveryOptType) {
+        this.deliveryOptType = deliveryOptType;
+    }
+
     public Integer getUsePoint() {
         return usePoint;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderRefundDetailVO.java

@@ -33,6 +33,8 @@ public class OrderRefundDetailVO implements Serializable {
     private String refundLogisticsId; // 物流退款id
     private String logisticsName;// 物流名称
     private String logisticsNumber;// 物流单号
+    private String logisticsCode ; // 物流公司code
+    private String logisticsCompanyId ; // 物流公司id
 
     // 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
     private int refundStatus = 1;
@@ -169,6 +171,22 @@ public class OrderRefundDetailVO implements Serializable {
      */
     private Double refundStoredValue;
 
+    public String getLogisticsCode() {
+        return logisticsCode;
+    }
+
+    public void setLogisticsCode(String logisticsCode) {
+        this.logisticsCode = logisticsCode;
+    }
+
+    public String getLogisticsCompanyId() {
+        return logisticsCompanyId;
+    }
+
+    public void setLogisticsCompanyId(String logisticsCompanyId) {
+        this.logisticsCompanyId = logisticsCompanyId;
+    }
+
     public double getRefundFreightPrice() {
         return refundFreightPrice;
     }