二级市场订单修改

sp-service/level-two-server/src/main/java/com/pj/tb_demand_quotation/TbDemandQuotationService.java

@@ -123,6 +123,7 @@ public class TbDemandQuotationService extends ServiceImpl<TbDemandQuotationMappe
         tbDemandQuotation.setCreateTime(new Date()); //创建时间
         tbDemandQuotation.setGroupId(rpcById.getGroupId());
         tbDemandQuotation.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 删除状态默认可用
+        tbDemandQuotation.setCreateName(appLoginInfo.getLoginName());
         int insert = tbDemandQuotationMapper.insert(tbDemandQuotation);
         if (insert == 1) {
             //修改二级市场收购商的需求状态

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/MethodGoodsDemandService.java

@@ -68,6 +68,7 @@ public class MethodGoodsDemandService {
             // TODO: 2023/8/8 获取商品图片暂时不需要
             //goodsDemandVo.setGoodsImg(goodsDto.getAvatar());
 
+            // 获取发布需求的详细信息
             goodsDemandVo.setGoodsDemandId(id);
             goodsDemandVo.setGoodsQuantity(item.getGoodsQuantity());
             goodsDemandVo.setGoodsDemandTime(item.getCreateTime());
@@ -78,8 +79,10 @@ public class MethodGoodsDemandService {
             goodsDemandVo.setPhone(item.getPhone());
             goodsDemandVo.setName(item.getName());
             goodsDemandVo.setIsConfirm(item.getIsConfirm());
+            goodsDemandVo.setTradeAreaId(item.getTradeAreaId());
+            goodsDemandVo.setTradeAreaName(item.getTradeAreaName());
 
-            // 获取收购商发布需求中，关联的已确认的报价信息
+            // 获取已确认的报价信息
             if(tbDemandQuotations.size() > 0) {
                 TbDemandQuotation tbDemandQuotation = tbDemandQuotations.get(0);
                 goodsDemandVo.setDemandQuotationId(tbDemandQuotation.getId());

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/vo/GoodsDemandVo.java

@@ -102,4 +102,14 @@ public class GoodsDemandVo {
      * 收购商是否确认:0=未确认,1=已确认
      */
     private Integer isConfirm;
+
+    /**
+     * 贸易区域id
+     */
+    private Long tradeAreaId;
+
+    /**
+     * 贸易区域名称
+     */
+    private String tradeAreaName;
 }

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrders.java

@@ -206,8 +206,14 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	 */
 	private Long leaderId;
 
+	/**
+	 * 二级收购商需求发布表的主键id
+	 */
+	private Long fkGoodsDemandId;
 
-
-
+	/**
+	 * 是否收货[0=未收货,1=已收货]
+	 */
+	private Integer isDelivery;
 
 }

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersApiController.java

@@ -57,22 +57,27 @@ public class TbOrdersApiController {
 	}
 
 
-	/** 二级市场订单*/
-	@RequestMapping("getList")
-	public AjaxJson getList() {
+	/** 二级市场订单 组长角色入口*/
+	@RequestMapping("getLeaderOrderList")
+	public AjaxJson getLeaderOrderList() {
 		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrders> list = tbOrdersService.getList(so.startPage());
+		List<TbOrdersDto> list = tbOrdersService.getLeaderOrderList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 
+	/** 二级市场订单 收购商角色入口*/
+	@RequestMapping("getPurchaserOrderList")
+	public AjaxJson getPurchaserOrderList() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbOrdersDto> list = tbOrdersService.getPurchaserOrderList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
 
 
-	/** 改 - 订单完成状态 (0=未完成,1=已完成) */
-	@RequestMapping("updateOrderFinish")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
-	public AjaxJson updateOrderFinish(Long id, Integer value){
-		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "order_finish", value, id);
-		return AjaxJson.getByLine(line);
+	/** 改 - 收购商确认收货 */
+	@RequestMapping("toDelivery")
+	public AjaxJson toDelivery(TbOrders t){
+		return AjaxJson.toAjax(tbOrdersService.updateById(t));
 	}
 
 	/** 改 - 删除状态(0=禁用,1=启用) */

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersDto.java

@@ -45,6 +45,31 @@ public class TbOrdersDto {
 	private String goodsName;
 
 	/**
+	 * 商品图片
+	 */
+	private String goodsImg;
+
+	/**
+	 * 商品量(根据海关允许发布表的计量单位决定,例如:柜,KG,吨)
+	 */
+	private String goodsQuantity;
+
+	/**
+	 * 商家备注
+	 */
+	private String remark;
+
+	/**
+	 * 计价单位
+	 */
+	private String goodsUnit;
+
+	/**
+	 * 商品编号
+	 */
+	private String goodsNo;
+
+	/**
 	 * 商品来源(国家)
 	 */
 	private String goodsFrom;
@@ -105,6 +130,11 @@ public class TbOrdersDto {
 	private Integer orderFinish;
 
 	/**
+	 * 是否收货[0=未收货,1=已收货]
+	 */
+	private Integer isDelivery;
+
+	/**
 	 * 装货地址
 	 */
 	private String loadingAddress;
@@ -166,6 +196,26 @@ public class TbOrdersDto {
 	 */
 	private String tradeAreaName;
 
+	/**
+	 * 组长Id
+	 */
+	private Long leaderId;
+
+	/**
+	 * 二级收购商需求发布表的主键id
+	 */
+	private Long fkGoodsDemandId;
+
+	/**
+	 * 收购商Id
+	 */
+	private String AcquirerId;
+
+	/**
+	 * 收购商名称
+	 */
+	private String AcquirerName;
+
 	public Long getId() {
 		return id;
 	}
@@ -397,4 +447,84 @@ public class TbOrdersDto {
 	public void setTradeAreaName(String tradeAreaName) {
 		this.tradeAreaName = tradeAreaName;
 	}
+
+	public String getGoodsImg() {
+		return goodsImg;
+	}
+
+	public void setGoodsImg(String goodsImg) {
+		this.goodsImg = goodsImg;
+	}
+
+	public String getGoodsQuantity() {
+		return goodsQuantity;
+	}
+
+	public void setGoodsQuantity(String goodsQuantity) {
+		this.goodsQuantity = goodsQuantity;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getGoodsUnit() {
+		return goodsUnit;
+	}
+
+	public void setGoodsUnit(String goodsUnit) {
+		this.goodsUnit = goodsUnit;
+	}
+
+	public String getGoodsNo() {
+		return goodsNo;
+	}
+
+	public void setGoodsNo(String goodsNo) {
+		this.goodsNo = goodsNo;
+	}
+
+	public Long getLeaderId() {
+		return leaderId;
+	}
+
+	public void setLeaderId(Long leaderId) {
+		this.leaderId = leaderId;
+	}
+
+	public Long getFkGoodsDemandId() {
+		return fkGoodsDemandId;
+	}
+
+	public void setFkGoodsDemandId(Long fkGoodsDemandId) {
+		this.fkGoodsDemandId = fkGoodsDemandId;
+	}
+
+	public String getAcquirerId() {
+		return AcquirerId;
+	}
+
+	public void setAcquirerId(String acquirerId) {
+		AcquirerId = acquirerId;
+	}
+
+	public String getAcquirerName() {
+		return AcquirerName;
+	}
+
+	public void setAcquirerName(String acquirerName) {
+		AcquirerName = acquirerName;
+	}
+
+	public Integer getIsDelivery() {
+		return isDelivery;
+	}
+
+	public void setIsDelivery(Integer isDelivery) {
+		this.isDelivery = isDelivery;
+	}
 }

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersMapper.xml

@@ -53,6 +53,8 @@
 			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
 			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
 			<if test=' this.has("leaderId") '> and leader_id = #{leaderId} </if>
+			<if test=' this.has("fkGoodsDemandId") '> and fk_goods_demand_id = #{fkGoodsDemandId} </if>
+			<if test=' this.has("isDelivery") '> and is_delivery = #{isDelivery} </if>
 		</where>
 		order by
 		<choose>

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -1,5 +1,6 @@
 package com.pj.tb_orders;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -7,14 +8,15 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
 import com.pj.api.dto.GoodsDto;
-import com.pj.common.core.exception.ServiceException;
-import com.pj.common.core.utils.StringUtils;
 import com.pj.current.config.SystemObject;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.OrderStatus;
+import com.pj.tb_demand_quotation.TbDemandQuotation;
+import com.pj.tb_demand_quotation.TbDemandQuotationService;
 import com.pj.tb_goods_demand.TbGoodsDemand;
+import com.pj.tb_goods_demand.TbGoodsDemandMapper;
 import com.pj.tb_goods_demand.TbGoodsDemandService;
 import com.pj.tb_goods_demand.vo.GoodsDemandVo;
 import com.pj.tb_purchaser.TbPurchaser;
@@ -44,6 +46,8 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 	private LevelOneServerInterface levelOneServerInterface;
 	@Autowired
 	private TbGoodsDemandService goodsDemandService;
+	@Autowired
+	private TbDemandQuotationService demandQuotationService;
 
 	/** 增 */
 	void add(TbOrders t){
@@ -76,24 +80,73 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		return tbOrdersMapper.getList();
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	/**
+	 * 二级市场订单 组长角色入口
 	 * 管理购买的商品订单（包括已支付、运输中、售后）
 	 * */
-	List<TbOrders> getList(SoMap so) {
-		//首先判断该用户是否为收购商
-		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
-		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
-			throw new ServiceException("当前登陆用户信息已失效!");
-		//执行查询
-		if(appLoginInfo.getUserType()==5){
-			so.put("purchaserId",appLoginInfo.getFk()); // 收购商编号
-		}
-		if(appLoginInfo.getUserType()==2){
-			so.put("leaderId",appLoginInfo.getFk()); // 边民组长id
-		}
+	List<TbOrdersDto> getLeaderOrderList(SoMap so) {
+		// 边民组长id
+		so.put("leaderId",StpAPPUserUtil.getAPPLoginInfo().getFk());
 		so.put("sortType",22);
 		so.put("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
-		return tbOrdersMapper.getList(so);
+		List<TbOrders> orderList = tbOrdersMapper.getList(so);
+
+		List<TbOrdersDto> ordersDtoList = new ArrayList<>();
+		BeanUtils.copyProperties(orderList,ordersDtoList);
+
+		ordersDtoList.forEach(ordersDto -> {
+			// 需求表主键Id
+			Long goodsDemandId = ordersDto.getFkGoodsDemandId();
+			// 获取订单关联的需求表信息
+			TbGoodsDemand goodsDemand = goodsDemandService.getById(goodsDemandId);
+
+			ordersDto.setGoodsImg(goodsDemand.getGoodsImg());
+			ordersDto.setGoodsQuantity(goodsDemand.getGoodsQuantity());
+			ordersDto.setRemark(goodsDemand.getRemark());
+			ordersDto.setGoodsUnit(goodsDemand.getGoodsUnit());
+			ordersDto.setGoodsNo(goodsDemand.getGoodsNo());
+			ordersDto.setGoodsQuantity(goodsDemand.getGoodsQuantity());
+			ordersDto.setAcquirerName(goodsDemand.getCreateName());
+
+		});
+
+		return ordersDtoList;
+	}
+
+	/**
+	 * 二级市场订单 收购商角色入口
+	 * 管理购买的商品订单（包括已支付、运输中、售后）
+	 * */
+	List<TbOrdersDto> getPurchaserOrderList(SoMap so) {
+		// 收购商id
+		so.put("purchaserId",StpAPPUserUtil.getAPPLoginInfo().getFk());
+		so.put("sortType",22);
+		so.put("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
+		List<TbOrders> orderList = tbOrdersMapper.getList(so);
+
+		List<TbOrdersDto> ordersDtoList = new ArrayList<>();
+
+		orderList.forEach(order -> {
+			// 需求表主键Id
+			Long goodsDemandId = order.getFkGoodsDemandId();
+			// 获取订单关联的需求表信息
+			TbGoodsDemand goodsDemand = goodsDemandService.getById(goodsDemandId);
+
+			TbOrdersDto ordersDto = new TbOrdersDto();
+			BeanUtils.copyProperties(order,ordersDto);
+
+			ordersDto.setGoodsImg(goodsDemand.getGoodsImg());
+			ordersDto.setGoodsQuantity(goodsDemand.getGoodsQuantity());
+			ordersDto.setRemark(goodsDemand.getRemark());
+			ordersDto.setGoodsUnit(goodsDemand.getGoodsUnit());
+			ordersDto.setGoodsNo(goodsDemand.getGoodsNo());
+			ordersDto.setGoodsQuantity(goodsDemand.getGoodsQuantity());
+			ordersDto.setAcquirerName(goodsDemand.getCreateName());
+
+			ordersDtoList.add(ordersDto);
+		});
+
+		return ordersDtoList;
 	}
 
 	/**
@@ -147,8 +200,12 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		orders.setConsigneePhone(goodsDemandVo.getPhone());
 		orders.setUnloadingAddress(goodsDemandVo.getAddressName());
 		orders.setLeaderId(goodsDemandVo.getLeaderId());
+		// 需求表主键Id
+		orders.setFkGoodsDemandId(goodsDemandVo.getGoodsDemandId());
 		//订单完成状态 (0=未完成,1=已完成)
 		orders.setOrderFinish(OrderStatus.ORDER_STATUS_ZERO.getCode());
+		//收货状态 (0=未收货,1=已收货)
+		orders.setOrderFinish(OrderStatus.ORDER_STATUS_ZERO.getCode());
 		//删除状态(0=禁用,1=启用)
 		orders.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 		//创建人
@@ -156,18 +213,25 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		orders.setCreateName(StpAPPUserUtil.getAPPLoginInfo().getLoginName());
 		orders.setCreateTime(new Date());
 
-		orders.setTradeAreaId(StpAPPUserUtil.getAPPLoginInfo().getTradeAreaId());
-
+		orders.setPurchaserId(StpAPPUserUtil.getAPPLoginInfo().getFk());
+		orders.setTradeAreaId(goodsDemandVo.getTradeAreaId());
+		orders.setTradeAreaName(goodsDemandVo.getTradeAreaName());
 
 		this.add(orders);
 
 		// 回写到收购商发布需求表，把收购商确认状态改为已确认
-		LambdaUpdateWrapper<TbGoodsDemand> wrapper = new LambdaUpdateWrapper();
+		LambdaUpdateWrapper<TbGoodsDemand> wrapper1 = new LambdaUpdateWrapper();
 		//收购商是否确认:0=未确认,1=已确认
-		wrapper.set(TbGoodsDemand::getIsConfirm, 1);
+		wrapper1.set(TbGoodsDemand::getIsConfirm, 1);
+		wrapper1.eq(TbGoodsDemand::getId, goodsDemandVo.getGoodsDemandId());
+		boolean update1 = goodsDemandService.update(wrapper1);
 
-		wrapper.eq(TbGoodsDemand::getId, goodsDemandVo.getGoodsDemandId());
-		goodsDemandService.update(wrapper);
+		// 回写到组长报价表，把报价结果状态改为已确认
+		LambdaUpdateWrapper<TbDemandQuotation> wrapper2 = new LambdaUpdateWrapper();
+		//收购商是否确认:0=未确认,1=已确认
+		wrapper2.set(TbDemandQuotation::getQuotationResult, 1);
+		wrapper2.eq(TbDemandQuotation::getDemandId, goodsDemandVo.getGoodsDemandId());
+		boolean update2 = demandQuotationService.update(wrapper2);
 
 
 		return true;