归属

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

@@ -12,6 +12,8 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
+import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -81,6 +83,8 @@ import com.google.common.collect.Sets;
 
 import cn.hutool.core.convert.Convert;
 
+import javax.persistence.criteria.Order;
+
 /**
  * 接收企业微信或者gic推送消息进行处理
  * Created by tgs on 2020/2/20.
@@ -128,6 +132,9 @@ public class MessageApiServiceImpl implements MessageApiService {
     private GroupChatService groupChatService;
     @Autowired
     private MemberQueryService memberQueryService ;
+    @Autowired
+    private WebOrderManageApiService webOrderManageApiService ;
+
 
     @Override
     public void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO) {
@@ -651,6 +658,22 @@ public class MessageApiServiceImpl implements MessageApiService {
         } else {
             extendContent.put("currentTab", 1);
         }
+        // 如果是自提
+        if (messageTypeEnum.equals(NoticeMessageTypeEnum.ORDER_TAKE)) {
+            com.gic.api.base.commons.ServiceResponse<OrderInfoDTO> orderResp = this.webOrderManageApiService.getBaseOrderInfo(enterpriseId,relationId) ;
+            OrderInfoDTO order = orderResp.getResult() ;
+            if(null != order) {
+                if(order.getBusinessType()==1) {
+                    extendContent.put("currentTab", 1);
+                }else if(order.getBusinessType()==2) {
+                    extendContent.put("currentTab", 0);
+                }else if(order.getBusinessType()==3) {
+                    extendContent.put("currentTab", 2);
+                }
+            }else {
+                log.info("订单未查到={}",relationId);
+            }
+        }
         Map<String, String> map = this.toMapValue(enterpriseId,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

@@ -492,12 +492,14 @@ public class GicOrderController {
         member.setAddressName(orderInfo.getBuyerName());
         member.setAddressDetail(orderInfo.getFullName() + orderInfo.getAddressInfo());
         orderDetailVO.setAddressInfo(orderInfo.getFullName() + orderInfo.getAddressInfo());
-        member.setBelongClerkId(orderInfo.getBelongClerkId());
-        member.setBelongClerkCode(orderInfo.getBelongClerkCode());
-        member.setBelongClerkName(orderInfo.getBelongClerkName());
-        member.setBelongStoreId(orderInfo.getBelongStoreId());
-        member.setBelongStoreCode(orderInfo.getBelongStoreCode());
-        member.setBelongStoreName(orderInfo.getBelongStoreName());
+        if(orderInfo.getBusinessType()==1) {
+            member.setBelongClerkId(orderInfo.getBelongClerkId());
+            member.setBelongClerkCode(orderInfo.getBelongClerkCode());
+            member.setBelongClerkName(orderInfo.getBelongClerkName());
+            member.setBelongStoreId(orderInfo.getBelongStoreId());
+            member.setBelongStoreCode(orderInfo.getBelongStoreCode());
+            member.setBelongStoreName(orderInfo.getBelongStoreName());
+        }
         orderDetailVO.setMember(member);
         // 判断能否发货
         // 导购发货，一笔订单仅允许单门店发货

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

@@ -372,6 +372,9 @@ public class GicOrderRefundController {
     private OperationUserQDTO getOper(String clerkId) {
         ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
         OperationUserQDTO dto = new OperationUserQDTO() ;
+        if(null == clerk) {
+            return dto ;
+        }
         dto.setOperatorId(clerk.getClerkId()) ;
         dto.setOperatorType(clerk.getClerkType());
         dto.setOperatorName(clerk.getClerkName());