Merge remote-tracking branch 'origin/dev' into dev

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -14,6 +14,8 @@ import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.*;
+import com.pj.tb_enterprise.TbEnterprise;
+import com.pj.tb_enterprise.TbEnterpriseMapper;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_goods_transit.TbGoodsTransitMapper;
 import com.pj.tb_goods_transit.TbGoodsTransitService;
@@ -57,6 +59,8 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 	private TbGoodsTransitService tbGoodsTransitService;
 	@Autowired
 	private LevelOneServerInterface levelOneServerInterface;
+	@Autowired
+	private TbEnterpriseMapper tbEnterpriseMapper;
 
 	/**
 	 * 远程调用
@@ -143,6 +147,13 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		//查询订单
 		TbOrder tbOrder = tbOrderMapper.selectById(orderId);
 		if(tbOrder == null)throw new ServiceException("订单状态异常!");
+		//如果该订单商户已叫车则无法进行取消
+		if(tbOrder.getCallCarStatus() == 1 || tbOrder.getCallCarStatus() == 2){
+			TbEnterprise enterprise = tbEnterpriseMapper.selectById(appLoginInfo.getFk());
+			String phone = null;
+			if(enterprise != null)phone = enterprise.getContact();
+			throw new ServiceException("您的订单单号为[ " + tbOrder.getTradeNo() + " ]商户已叫车,无法进行取消,请联系商户电话[ " + phone + " ]进行取消。");
+		}
 		//将状态设置已取消
 		tbOrder.setCancelPeople(1);
 		//执行保存

sp-service/level-one-server/src/main/java/com/pj/tb_order_people_confirm/TbOrderPeopleConfirmAppController.java

@@ -1,36 +0,0 @@
-package com.pj.tb_order_people_confirm;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.pj.project4sp.SP;
-import com.pj.utils.sg.AjaxJson;
-import com.pj.utils.so.SoMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * Controller: tb_order_people_confirm -- 便民确认订单监听表
- * @author yzs
- */
-@RestController
-@RequestMapping("/app/TbOrderPeopleConfirm/")
-public class TbOrderPeopleConfirmAppController {
-
-	/** 底层 Service 对象 */
-	@Autowired
-	TbOrderPeopleConfirmService tbOrderPeopleConfirmService;
-
-
-	/** 查集合 - 根据当前边民的组Id与订单Id查看边民确认情况 */
-	@RequestMapping("getByOrderId")
-	public AjaxJson getByOrderId(@RequestParam("orderId") Long orderId) {
-		List<TbOrderPeopleConfirm> list = tbOrderPeopleConfirmService.getByOrderId(orderId);
-		return AjaxJson.getPageData(Long.valueOf(list.size()), list);
-	}
-
-
-}

sp-service/level-one-server/src/main/java/com/pj/tb_order_people_confirm/TbOrderPeopleConfirmService.java

@@ -3,14 +3,12 @@ package com.pj.tb_order_people_confirm;
 import java.util.List;
 
 import com.pj.tb_people.MethodPeopleService;
-import com.pj.tb_people.TbPeople;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
-import com.pj.utils.sg.*;
 
 /**
  * Service: tb_order_people_confirm -- 便民确认订单监听表
@@ -53,13 +51,4 @@ public class TbOrderPeopleConfirmService extends ServiceImpl<TbOrderPeopleConfir
 		return tbOrderPeopleConfirmMapper.getList(so);
 	}
 
-	/** 查集合 - 根据当前边民的组Id与订单Id查看边民确认情况 */
-	List<TbOrderPeopleConfirm> getByOrderId(Long orderId) {
-		TbPeople tbPeople = methodPeopleService.getByAppUserFk();
-		SoMap soMap = new SoMap();
-		soMap.put("orderId",orderId);
-		soMap.put("groupId",tbPeople.getGroupId());
-		return tbOrderPeopleConfirmMapper.getList(soMap);
-	}
-
 }

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -8,16 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.client.admin.AdminInterface;
-import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.PeopleDto;
-import com.pj.common.core.exception.ServiceException;
-import com.pj.common.core.utils.DateUtil;
-import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.dto.PCLoginUserInfo;
-import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.*;
-import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_goods_transit.TbGoodsTransitMapper;
 import com.pj.tb_group.TbGroup;
 import com.pj.tb_group.TbGroupMapper;
@@ -133,14 +127,6 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		return tbPeopleMapper.getLeftPeople();
 	}
 
-	/** 查集合 - 根据组Id查询组内所有边民 */
-	List<TbPeople> getByGroupId() {
-		TbPeople tbPeople = methodPeopleService.getByAppUserFk();
-		SoMap so = new SoMap();
-		so.put("groupId",tbPeople.getGroupId());
-		return tbPeopleMapper.getList(so);
-	}
-
 	/**
 	 * 审核
 	 */