一级市场订单确认及取消修改

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/GoodsTransitAppController.java

@@ -78,16 +78,6 @@ public class GoodsTransitAppController {
         return AjaxJson.getSuccess();
     }
 
-    /**
-     * 改    商铺确认情况[0=待确认,1=已确认,2=拒绝]
-     */
-    @PostMapping("updateEnterpriseConfirm")
-    public AjaxJson updateEnterpriseConfirm(Long id,Long orderId, Integer enterpriseConfirm) {
-        TbGoodsTransit tbGoodsTransit = new TbGoodsTransit();
-        tbGoodsTransit.setId(id);
-        tbGoodsTransit.setEnterpriseConfirm(enterpriseConfirm);
-        return AjaxJson.toAjax(tbGoodsTransitService.updateEnterpriseConfirm(tbGoodsTransit,orderId));
-    }
 
     /**
      * app端用户添加商品

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/MethodGoodsTransitService.java

@@ -144,7 +144,11 @@ public class MethodGoodsTransitService {
         tbOrder.setCreateName(appLoginInfo.getLoginName());
         tbOrder.setCreateTime(new Date());
         //		//查询是否已存在该订单
-        List<TbOrder> tbOrderList = tbOrderMapper.selectList(new LambdaQueryWrapper<TbOrder>().eq(TbOrder::getGoodsId, tbGoodsTransit.getId()).eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode()));
+        List<TbOrder> tbOrderList = tbOrderMapper.selectList(
+                new LambdaQueryWrapper<TbOrder>()
+                        .eq(TbOrder::getGoodsId, tbGoodsTransit.getId())
+                        .ne(TbOrder::getEnterpriseConfirm, 2)//不等于一级市场商户已拒绝的订单
+                        .eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode()));
         if(tbOrderList.size() != 0)throw new RuntimeException("当前商品已存在订单,暂时无法继续下单!");
 
         return tbOrder;

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -312,41 +312,6 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		throw new RuntimeException("订单预创建异常!");
 	}
 
-	boolean updateEnterpriseConfirm(TbGoodsTransit tbGoodsTransit,Long orderId) {
-
-		// 商户拒绝接单后把订单状态恢复为默认值
-		if (2 == tbGoodsTransit.getEnterpriseConfirm()) {
-			tbGoodsTransit.setIsOrders(0);//是否已被下单[0=未被下单,1=已被下单]
-			tbGoodsTransit.setGoodsStatus(1);//商品状态(0=下架,1=在售)
-			boolean byId = updateById(tbGoodsTransit);
-			if(byId){
-				// 修改订单商户确认情况
-				TbOrder tbOrder = tbOrderMapper.selectById(orderId);
-				if(tbOrder == null)throw new RuntimeException("订单信息异常!");
-				tbOrder.setEnterpriseConfirm(tbGoodsTransit.getEnterpriseConfirm());
-				//修改
-				int updateById = tbOrderMapper.updateById(tbOrder);
-				if(updateById != 1)throw new RuntimeException("服务器繁忙~");
-			}
-		}
-
-		// 商户确认接单后修改订单表的‘商家确认状态’为已确认
-		if (1 == tbGoodsTransit.getEnterpriseConfirm()) {
-			LambdaUpdateWrapper<TbOrder> wrapper = new LambdaUpdateWrapper();
-			//一级市场商户确认(0=待确认,1=是,2=否)
-			wrapper.set(TbOrder::getEnterpriseConfirm, 1);
-			// TODO: 申报[0=待申报,1=申报通过,2=申报不通过]
-			//wrapper.set(TbOrder::getApply, 1);
-
-			wrapper.eq(TbOrder::getGoodsId, tbGoodsTransit.getId());
-			orderService.update(wrapper);
-		}
-
-
-
-		return true;
-	}
-
 	/**
 	 * 导入
 	 * @param file excel文件

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

@@ -5,6 +5,7 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -99,6 +100,15 @@ public class TbOrderAppController {
 		return AjaxJson.getError();
 	}
 
+	/**
+	 * 改    商铺确认情况[0=待确认,1=已确认,2=拒绝]
+	 */
+	@PostMapping("updateEnterpriseConfirm")
+	public AjaxJson updateEnterpriseConfirm(TbOrder order) {
+
+		return AjaxJson.toAjax(tbOrderService.updateEnterpriseConfirm(order));
+	}
+
 	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
 
 	/** 改 转售状态：根据订单Id把订单改为已转售 */

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

@@ -11,12 +11,10 @@ import com.pj.api.dto.OrderDto;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
-import com.pj.enummj.ApplyStatus;
-import com.pj.enummj.DeleteStatus;
-import com.pj.enummj.TradeStatus;
-import com.pj.enummj.UserType;
+import com.pj.enummj.*;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_goods_transit.TbGoodsTransitMapper;
+import com.pj.tb_goods_transit.TbGoodsTransitService;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleMapper;
 import com.pj.utils.so.SoMap;
@@ -48,6 +46,8 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 
 	@Autowired
 	private TbGoodsTransitMapper tbGoodsTransitMapper;
+	@Autowired
+	private TbGoodsTransitService tbGoodsTransitService;
 
 	/**  app端: 生成一级市场订单 */
 	void appAdd(TbOrder t){
@@ -217,6 +217,27 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		return this.update(wrapper);
 	}
 
+	boolean updateEnterpriseConfirm(TbOrder order) {
+
+		// 商户拒绝接单后把商户确认状态改为否，并把商品发布表状态恢复为默认值
+		if (2 == order.getEnterpriseConfirm()) {
+			LambdaUpdateWrapper<TbGoodsTransit> wrapper = new LambdaUpdateWrapper<>();
+			//商品未被下单
+			wrapper.set(TbGoodsTransit::getIsOrders, OrderStatus.ORDER_STATUS_ZERO.getCode());
+			//商品在售
+			wrapper.set(TbGoodsTransit::getGoodsStatus, GoodsStatus.GOODS_STATUS_ON.getCode());
+
+			wrapper.eq(TbGoodsTransit::getId, order.getGoodsId());
+			boolean update = tbGoodsTransitService.update(wrapper);
+
+		}
+
+		// 修改订单表的商家确认状态
+		order.setGoodsId(null);
+		boolean flag = updateById(order);
+
+		return flag;
+	}
 
 	/** 远程调用:根据时间和登陆人查询订单 */
 	public List<OrderDto> selectOrderList(Date currDay, Long appUserId){