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

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

@@ -1,11 +1,14 @@
 package com.pj.tb_goods_transit;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
 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.TbOrderService;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,9 @@ public class GoodsTransitAppController {
     @Autowired
     private TbGoodsTransitService tbGoodsTransitService;
 
+    @Autowired
+    TbOrderService tbOrderService;
+
     /**
      * 查 - 根据id
      */
@@ -89,6 +95,34 @@ public class GoodsTransitAppController {
         return AjaxJson.getSuccess();
     }
 
+    /** 改    enterprise_confirm：'商铺确认情况[0=待确认,1=已确认,2=拒绝]',*/
+    @RequestMapping("updateEnterpriseConfirm")
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
+    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);
+
+            wrapper.eq(TbOrder::getGoodsId, id);
+            tbOrderService.update(wrapper);
+        }
+
+        return AjaxJson.getSuccess();
+    }
+
     /**
      * app端用户添加商品
      */

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

@@ -7,7 +7,7 @@
 
 	<!-- ================================== 查询相关 ================================== -->
 	<!-- select id, trade_area_id, trade_area_name, address_ids, sale_main_id, trade_no, buy_user_id, buy_user_name, buy_user_type, enterprise_id, enterprise_name, total_weight, total_price, trade_time, trade_status, pay_type, settle_time, real_price, should_price, settle_user_id, record_user_id, record_time, record, refund_reason, refund_time, receive_name, receive_phone, receive_address, out_time, goods_names, apply, apply_time, apply_result, apply_fail_reason, distribution, confirm, pick, pick_time, shop_id, shop_name, send, send_time, level_two_order_id, create_time, create_by, create_name, update_time, update_by, update_name, delete_status from tb_order  -->
-	
+
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.tb_order.TbOrder"></resultMap>
 
@@ -19,10 +19,10 @@
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
 		select *
-		from tb_order 
+		from tb_order
 	</sql>
 
-	
+
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
@@ -77,6 +77,7 @@
 			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>
 			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("enterpriseConfirm") '> and enterprise_confirm = #{enterpriseConfirm} </if>
 		</where>
 		order by
 		<choose>
@@ -133,14 +134,14 @@
 			<otherwise> id desc </otherwise>
 		</choose>
 	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
 
 </mapper>