自提时间

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -600,13 +600,11 @@ public class MessageApiServiceImpl implements MessageApiService {
             return com.gic.api.base.commons.ServiceResponse.failure("9999", "导购查不到");
         }
         Map<String, Object> extendContent = new HashMap<>();
-        if (messageTypeEnum.getCategory() == 5) {
         if (messageTypeEnum.equals(NoticeMessageTypeEnum.ORDER_PAY)) {
             extendContent.put("currentTab ", 0);
         } else {
             extendContent.put("currentTab ", 1);
         }
-        }
         Map<String, String> map = this.toMapValue(memberId, valueList);
         NoticeMessageQDTO qdto = this.getDTO(enterpriseId, clerkId, relationId, noticeType, map, extendContent);
         list.add(qdto);

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.controller.order;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -148,6 +149,7 @@ public class GicOrderController {
                     List<ListOrderItemDTO> itemList = order.getOrderItemDTOList();
                     List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
                     vo.setOrderItemList(voItemList);
+                    vo.setPickUpTime(order.getWriteOffTime());
                     voList.add(vo);
                 }
             }
@@ -249,7 +251,7 @@ public class GicOrderController {
         boolean canDeliverFlag = false;
         // 发货操作类型(0后台/1好办门店):用于判断好办操作发货还是后台，防止双边发货
         Integer deliveryOptType = orderInfo.getDeliveryOptType();
-        String deliverStoreId = null;
+        String deliverStoreId = orderInfo.getDeliverStoreId();
         logger.info("发货类型={},发货门店={},orderId={}", deliveryOptType, deliverStoreId, orderInfo.getOrderId());
         if (null == deliveryOptType) {
             canDeliverFlag = true;
@@ -258,8 +260,8 @@ public class GicOrderController {
         }
         orderDetailVO.setCanDeliverFlag(canDeliverFlag);
         // 核销导购
-        String verificationClerkName = "";
-        orderDetailVO.setVerificationClerkName("核销导购");
+        String verificationClerkName = orderInfo.getWriteOffClerkName();
+        orderDetailVO.setVerificationClerkName(verificationClerkName);
         return orderDetailVO;
     }
 
@@ -328,7 +330,7 @@ public class GicOrderController {
         return RestResponse.successResult(voList);
     }
 
-    // 订单-可发货订单项列表查询
+    // 订单-发货
     @RequestMapping("order-logistics-deliver")
     public RestResponse<Object> orderDeliver(String enterpriseId, String orderId, String storeId, String orderItemIds,
             String companyCode, String logisticsNo, String companyId, String companyName) {
@@ -366,7 +368,7 @@ public class GicOrderController {
     @RequestMapping("list-member-order")
     public RestResponse<Object> orderList(String enterpriseId, String memberId, String search,
             @RequestParam(defaultValue = "-1") int status, @RequestParam(defaultValue = "0") int deliveryChannel,
-            @RequestParam(defaultValue = "-1") int orderType, BasePageInfo pageInfo) {
+            @RequestParam(defaultValue = "-1") int orderType, BasePageInfo pageInfo, String startTime, String endTime) {
         if (StringUtils.isEmpty(memberId)) {
             return RestResponse.failure("9999", "memberId为空");
         }
@@ -374,11 +376,22 @@ public class GicOrderController {
         if (status == -1) {
             strStatus = null;
         }
+        Date startDate = null;
+        if (StringUtils.isNotEmpty(startTime)) {
+            startDate = DateUtil.strToDate(startTime, "yyyy-MM-dd");
+        }
+        Date endDate = null;
+        if (StringUtils.isNotEmpty(endTime)) {
+            endDate = DateUtil.strToDate(endTime, "yyyy-MM-dd");
+            endDate = DateUtil.getEndTimeOfDay(endDate);
+        }
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setOrderStep(strStatus);
         qdto.setMemberId(memberId);
+        qdto.setStartDate(startDate);
+        qdto.setEndDate(endDate);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         if (StringUtils.isNotEmpty(search)) {
             qdto.setSearchOrderParam(search);
@@ -392,6 +405,7 @@ public class GicOrderController {
     public RestResponse<Object> modifyOrderDeliver(String memberId, String enterpriseId, String orderId, String storeId,
             String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,
             @RequestParam(defaultValue = "1") int type) {
+        logger.info("换货单修改物流={}", orderId, type);
         if (type == 2) {
             ExchangeDeliveryBackQDTO qdto = new ExchangeDeliveryBackQDTO();
             qdto.setCourierNumber(logisticsNo);
@@ -400,7 +414,6 @@ public class GicOrderController {
             qdto.setLogisticsCompanyName(companyName);
             ServiceResponse<Void> resp = this.afterSalesManageApiService.exchangeSellerDeliveryGoods(enterpriseId,
                     memberId, qdto);
-            logger.info("换货单发货={}", JSON.toJSONString(resp));
             if (resp.isSuccess()) {
                 return RestResponse.successResult();
             }
@@ -532,9 +545,6 @@ public class GicOrderController {
     }
 
     private String createIntegralRecord(String enterpriseId, int status, ClerkQo clerkDTO, String writeOffCode) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("创建核销记录........");
-        }
         DubboResult<IntegralMallExchangeLogDTO> integralResult = integralmallService
                 .getIntegralMallExchangeLogByWriteOffCode(enterpriseId, writeOffCode);
         IntegralMallExchangeLogDTO data = integralResult.getData();