8.8 修正一级市场边民拒绝

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

@@ -17,6 +17,7 @@ import com.pj.tb_enterprise.TbEnterprise;
 import com.pj.tb_enterprise.TbEnterpriseMapper;
 import com.pj.tb_goods.TbGoods;
 import com.pj.tb_goods.TbGoodsMapper;
+import com.pj.tb_goods_cart.TbGoodsCartMapper;
 import com.pj.tb_goods_transit.param.JudgeTransitParam;
 import com.pj.tb_goods_transit.param.PurchaseLevelOneGoodsTransitParam;
 import com.pj.tb_goods_transit.param.TransactionGoodsParam;
@@ -72,6 +73,8 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 
 	@Autowired
 	private TbEnterpriseMapper tbEnterpriseMapper;
+	@Autowired
+	private TbGoodsCartMapper tbGoodsCartMapper;
 
 	/** 增 */
 	void add(TbGoodsTransit t){
@@ -112,7 +115,7 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 	List<TbGoodsTransit> getTransitList(SoMap so,String goodsType){
 		//设置可展示的状态
 		if(goodsType != null){
-			so.set("goodsType", goodsType);
+			so.put("goodsType", goodsType);
 		}
 		//获取在销商品列表,根据日期进行降序排序
 		List<TbGoodsTransit> goodsTransitList = tbGoodsTransitMapper.getList(so);
@@ -266,6 +269,8 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		//执行保存 todo:创建订单
 		int insert = tbOrderMapper.insert(tbOrder);
 		if(insert == 1){
+			//删除购物车
+			tbGoodsCartMapper.deleteById(purchaseLevelOntGoodsTransitParam.getGoodsCartId());
 			//将商品信息改成已被下单
 			tbGoodsTransit.setIsOrders(1);
 			int updateById = tbGoodsTransitMapper.updateById(tbGoodsTransit);

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

@@ -19,6 +19,9 @@ public class PurchaseLevelOneGoodsTransitParam {
     @NotBlank(message = "所购商品ID不能为空")
     private String goodsTransitId;
 
+    /** 购物车ID */
+    private Long goodsCartId;
+
 //    private String receiveName;
 //    private String receivePhone;
 //    private String receiveAddress;

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

@@ -76,7 +76,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private Long groupId;
 
 	/**
-	 *  商品ID
+	 *  过审商品id[goodstransitid]
 	 */
 	private Long goodsId;
 

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

@@ -16,9 +16,9 @@ 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.DeleteStatus;
-import com.pj.enummj.IsLock;
-import com.pj.enummj.People;
+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;
 import com.pj.tb_order.TbOrder;
@@ -69,6 +69,8 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	/** 订单对象 */
 	@Autowired
 	private TbOrderMapper tbOrderMapper;
+	@Autowired
+	private TbGoodsTransitMapper tbGoodsTransitMapper;
 
 
 	@Autowired
@@ -265,7 +267,29 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	 * @param confirm 1=确认,0=拒绝
 	 * @param orderId 一级市场订单表ID
 	 */
-	public void confirmOrder(Integer confirm,Long orderId){
+	public boolean confirmOrder(Integer confirm,Long orderId){
+		//边民拒绝
+		if(confirm == null || confirm != 1 ||  confirm.toString().equals("")){
+			//修改订单表状态
+			TbOrder order = tbOrderMapper.selectById(orderId);
+			if(order == null)throw new ServiceException("订单信息异常!");
+			//设定为边民拒绝
+			order.setPeopleConfirm(2);
+			//执行保存
+			int updated = tbOrderMapper.updateById(order);
+			//将goodstransit修改成未被接单
+			if(updated == 1){
+				Long goodsId = order.getGoodsId();
+				TbGoodsTransit tbGoodsTransit = tbGoodsTransitMapper.selectById(goodsId);
+				if(tbGoodsTransit == null)throw new ServiceException("商品信息异常!");
+				//状态设置2
+				tbGoodsTransit.setIsOrders(ReleaseStatus.RELEASE_STATUS_PUBLISH.getCode());
+				//执行修改
+				int updateById = tbGoodsTransitMapper.updateById(tbGoodsTransit);
+				return updateById == 1;
+			}
+		}
+		//边民同意
 		//获取登录人
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
@@ -301,9 +325,11 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 				int updateById = tbOrderMapper.updateById(tbOrder);
 				if(updateById != 1)throw new RuntimeException("执行边民确认异常!");
 				//todo:发送冻结请求 -> 接收冻结请求，边民账户货款进行冻结，并给出回执
+
+				return true;
 			}
 		}
-
+		return false;
 	}