二级市场收购商拒绝接单

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

@@ -135,5 +135,10 @@ public class AppTbGoodsDemandController {
         return AjaxJson.getError("处理报价结果失败!");
     }
 
+    /** 收购商拒绝接单，即收购商拒绝组长的报价，不生成二级市场订单 ，恢复发布需求的状态*/
+    @RequestMapping("refuse")
+    public AjaxJson refuse(TbGoodsDemand t) {
+        return AjaxJson.toAjax(tbGoodsDemandService.refuse(t));
+    }
 
 }

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

@@ -81,6 +81,7 @@ public class MethodGoodsDemandService {
             goodsDemandVo.setIsConfirm(item.getIsConfirm());
             goodsDemandVo.setTradeAreaId(item.getTradeAreaId());
             goodsDemandVo.setTradeAreaName(item.getTradeAreaName());
+            goodsDemandVo.setIsRelease(item.getIsRelease());
 
             // 获取已确认的报价信息
             if(tbDemandQuotations.size() > 0) {

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

@@ -157,7 +157,7 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	/**
 	 * 是否发布
 	 */
-	private String isRelease;
+	private Integer isRelease;
 
 	/**
 	 * 收件地址

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

@@ -3,12 +3,15 @@ package com.pj.tb_goods_demand;
 import java.util.Date;
 import java.util.List;
 
-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;
 import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.OrderStatus;
+import com.pj.enummj.ReleaseStatus;
+import com.pj.tb_demand_quotation.TbDemandQuotation;
+import com.pj.tb_demand_quotation.TbDemandQuotationService;
 import com.pj.tb_goods_demand.vo.GoodsDemandVo;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +33,8 @@ public class TbGoodsDemandService extends ServiceImpl<TbGoodsDemandMapper, TbGoo
 	/** 底层 Mapper 对象 */
 	@Autowired
 	TbGoodsDemandMapper tbGoodsDemandMapper;
+	@Autowired
+	private TbDemandQuotationService demandQuotationService;
 
 	@Autowired
 	private MethodGoodsDemandService methodGoodsDemandService;
@@ -128,4 +133,18 @@ public class TbGoodsDemandService extends ServiceImpl<TbGoodsDemandMapper, TbGoo
 		throw new RuntimeException("服务器繁忙~");
 	}
 
+	boolean refuse(TbGoodsDemand t) {
+		t.setIsOrders(OrderStatus.ORDER_STATUS_ZERO.getCode());//未被接单
+		t.setIsRelease(ReleaseStatus.RELEASE_STATUS_PUBLISH.getCode());//已发布
+		t.setIsConfirm(0);//收购商未确认
+		update(t);
+
+		LambdaUpdateWrapper<TbDemandQuotation> wrapper = new LambdaUpdateWrapper<>();
+		//报价结果[0=待确认,1=确认,2=拒绝]
+		wrapper.set(TbDemandQuotation::getQuotationResult, 2);
+		wrapper.eq(TbDemandQuotation::getDemandId, t.getId());
+		boolean update = demandQuotationService.update(wrapper);
+
+		return update;
+	}
 }

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

@@ -104,6 +104,11 @@ public class GoodsDemandVo {
     private Integer isConfirm;
 
     /**
+     * 是否发布
+     */
+    private Integer isRelease;
+
+    /**
      * 贸易区域id
      */
     private Long tradeAreaId;

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -16,6 +17,8 @@ import java.util.Date;
  * Model: tb_orders -- 订单表
  * @author lbl
  */
+@Data
+@NoArgsConstructor
 public class TbOrdersDto {
 
 	// ---------- 表中字段 ----------
@@ -232,339 +235,5 @@ public class TbOrdersDto {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date goodsDemandTime;
 
-	public Long getId() {
-		return id;
-	}
 
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getLevelOneOrderId() {
-		return levelOneOrderId;
-	}
-
-	public void setLevelOneOrderId(Long levelOneOrderId) {
-		this.levelOneOrderId = levelOneOrderId;
-	}
-
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public Long getGoodsId() {
-		return goodsId;
-	}
-
-	public void setGoodsId(Long goodsId) {
-		this.goodsId = goodsId;
-	}
-
-	public String getGoodsName() {
-		return goodsName;
-	}
-
-	public void setGoodsName(String goodsName) {
-		this.goodsName = goodsName;
-	}
-
-	public String getGoodsFrom() {
-		return goodsFrom;
-	}
-
-	public void setGoodsFrom(String goodsFrom) {
-		this.goodsFrom = goodsFrom;
-	}
-
-	public String getShipperPhone() {
-		return shipperPhone;
-	}
-
-	public void setShipperPhone(String shipperPhone) {
-		this.shipperPhone = shipperPhone;
-	}
-
-	public String getShipperName() {
-		return shipperName;
-	}
-
-	public void setShipperName(String shipperName) {
-		this.shipperName = shipperName;
-	}
-
-	public Long getDriverId() {
-		return driverId;
-	}
-
-	public void setDriverId(Long driverId) {
-		this.driverId = driverId;
-	}
-
-	public String getDriverName() {
-		return driverName;
-	}
-
-	public void setDriverName(String driverName) {
-		this.driverName = driverName;
-	}
-
-	public String getDriverPhone() {
-		return driverPhone;
-	}
-
-	public void setDriverPhone(String driverPhone) {
-		this.driverPhone = driverPhone;
-	}
-
-	public Long getCarId() {
-		return carId;
-	}
-
-	public void setCarId(Long carId) {
-		this.carId = carId;
-	}
-
-	public String getCarType() {
-		return carType;
-	}
-
-	public void setCarType(String carType) {
-		this.carType = carType;
-	}
-
-	public String getConsigneeName() {
-		return consigneeName;
-	}
-
-	public void setConsigneeName(String consigneeName) {
-		this.consigneeName = consigneeName;
-	}
-
-	public String getConsigneePhone() {
-		return consigneePhone;
-	}
-
-	public void setConsigneePhone(String consigneePhone) {
-		this.consigneePhone = consigneePhone;
-	}
-
-	public String getDeclarationNumber() {
-		return declarationNumber;
-	}
-
-	public void setDeclarationNumber(String declarationNumber) {
-		this.declarationNumber = declarationNumber;
-	}
-
-	public Integer getOrderFinish() {
-		return orderFinish;
-	}
-
-	public void setOrderFinish(Integer orderFinish) {
-		this.orderFinish = orderFinish;
-	}
-
-	public String getLoadingAddress() {
-		return loadingAddress;
-	}
-
-	public void setLoadingAddress(String loadingAddress) {
-		this.loadingAddress = loadingAddress;
-	}
-
-	public String getUnloadingAddress() {
-		return unloadingAddress;
-	}
-
-	public void setUnloadingAddress(String unloadingAddress) {
-		this.unloadingAddress = unloadingAddress;
-	}
-
-	public String getComment() {
-		return comment;
-	}
-
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateName() {
-		return updateName;
-	}
-
-	public void setUpdateName(String updateName) {
-		this.updateName = updateName;
-	}
-
-	public Integer getDeleteStatus() {
-		return deleteStatus;
-	}
-
-	public void setDeleteStatus(Integer deleteStatus) {
-		this.deleteStatus = deleteStatus;
-	}
-
-	public Long getUpdateBy() {
-		return updateBy;
-	}
-
-	public void setUpdateBy(Long updateBy) {
-		this.updateBy = updateBy;
-	}
-
-	public Long getCreateBy() {
-		return createBy;
-	}
-
-	public void setCreateBy(Long createBy) {
-		this.createBy = createBy;
-	}
-
-	public String getCreateName() {
-		return createName;
-	}
-
-	public void setCreateName(String createName) {
-		this.createName = createName;
-	}
-
-	public Long getTradeAreaId() {
-		return tradeAreaId;
-	}
-
-	public void setTradeAreaId(Long tradeAreaId) {
-		this.tradeAreaId = tradeAreaId;
-	}
-
-	public String getTradeAreaName() {
-		return tradeAreaName;
-	}
-
-	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;
-	}
-
-	public Double getQuotation() {
-		return quotation;
-	}
-
-	public void setQuotation(Double quotation) {
-		this.quotation = quotation;
-	}
-
-	public String getQuotationPerson() {
-		return quotationPerson;
-	}
-
-	public void setQuotationPerson(String quotationPerson) {
-		this.quotationPerson = quotationPerson;
-	}
-
-	public Date getGoodsDemandTime() {
-		return goodsDemandTime;
-	}
-
-	public void setGoodsDemandTime(Date goodsDemandTime) {
-		this.goodsDemandTime = goodsDemandTime;
-	}
 }