一级市场订单修改商家确认

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

@@ -13,10 +13,7 @@ import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -33,8 +30,6 @@ public class GoodsTransitAppController {
     @Autowired
     private TbGoodsTransitService tbGoodsTransitService;
 
-    @Autowired
-    TbOrderService tbOrderService;
 
     /**
      * 查 - 根据id
@@ -88,33 +83,15 @@ public class GoodsTransitAppController {
     }
 
     /**
-     * 改    enterprise_confirm：'商铺确认情况[0=待确认,1=已确认,2=拒绝]',
+     * 改    商铺确认情况[0=待确认,1=已确认,2=拒绝]
      */
-    @RequestMapping("updateEnterpriseConfirm")
-//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
+    @PostMapping("updateEnterpriseConfirm")
     public AjaxJson updateEnterpriseConfirm(Long id, Integer enterpriseConfirm) {
-        TbGoodsTransit t = new TbGoodsTransit();
-        t.setId(id);
-        t.setEnterpriseConfirm(enterpriseConfirm);
-        // 商户拒绝接单后把订单状态恢复为未被下单
-        if (2 == enterpriseConfirm) {
-            t.setIsOrders(0);
-        }
-        tbGoodsTransitService.update(t);
-
-        // 商户确认接单后修改订单表的‘商家确认状态’为已确认
-        if (1 == enterpriseConfirm) {
-            LambdaUpdateWrapper<TbOrder> wrapper = new LambdaUpdateWrapper();
-            //一级市场商户确认(0=待确认,1=是,2=否)
-            wrapper.set(TbOrder::getEnterpriseConfirm, 1);
-            // TODO: 申报[0=待申报,1=申报通过,2=申报不通过]
-            //wrapper.set(TbOrder::getApply, 1);
+        TbGoodsTransit tbGoodsTransit = new TbGoodsTransit();
+        tbGoodsTransit.setId(id);
+        tbGoodsTransit.setEnterpriseConfirm(enterpriseConfirm);
 
-            wrapper.eq(TbOrder::getGoodsId, id);
-            tbOrderService.update(wrapper);
-        }
-
-        return AjaxJson.getSuccess();
+        return AjaxJson.toAjax(tbGoodsTransitService.updateEnterpriseConfirm(tbGoodsTransit));
     }
 
     /**

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

@@ -9,6 +9,7 @@ import java.util.List;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
@@ -24,6 +25,7 @@ import com.pj.tb_goods_transit.param.PurchaseLevelOneGoodsTransitParam;
 import com.pj.tb_goods_transit.param.TransactionGoodsParam;
 import com.pj.tb_order.TbOrder;
 import com.pj.tb_order.TbOrderMapper;
+import com.pj.tb_order.TbOrderService;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleMapper;
 import com.pj.tb_trade_area.TbTradeArea;
@@ -77,6 +79,9 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 	@Autowired
 	private TbGoodsCartMapper tbGoodsCartMapper;
 
+	@Autowired
+	TbOrderService orderService;
+
 	/** 增 */
 	void add(TbGoodsTransit t){
 		//获取当前登录人
@@ -302,6 +307,28 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		throw new RuntimeException("订单预创建异常!");
 	}
 
+	boolean updateEnterpriseConfirm(TbGoodsTransit tbGoodsTransit) {
+
+		// 商户拒绝接单后把订单状态恢复为默认值
+		if (2 == tbGoodsTransit.getEnterpriseConfirm()) {
+			tbGoodsTransit.setIsOrders(0);//是否已被下单[0=未被下单,1=已被下单]
+			tbGoodsTransit.setGoodsStatus(1);//商品状态(0=下架,1=在售)
+		}
+		updateById(tbGoodsTransit);
+
+		// 商户确认接单后修改订单表的‘商家确认状态’为已确认
+		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;
+	}
 
 	/**
 	 * 导入