二级市场收购商确认并生成订单

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

@@ -64,7 +64,7 @@ public class MethodGoodsDemandService {
             GoodsDemandVo goodsDemandVo = new GoodsDemandVo();
 
             //查询商品基本信息
-            GoodsDto goodsDto = levelOneServerInterface.getByGoodsId(item.getLevelOneGoodsId());
+            //GoodsDto goodsDto = levelOneServerInterface.getByGoodsId(item.getLevelOneGoodsId());
             // TODO: 2023/8/8 获取商品图片暂时不需要
             //goodsDemandVo.setGoodsImg(goodsDto.getAvatar());
 
@@ -73,6 +73,10 @@ public class MethodGoodsDemandService {
             goodsDemandVo.setGoodsDemandTime(item.getCreateTime());
             goodsDemandVo.setGoodsName(item.getGoodsName());
             goodsDemandVo.setIsOrders(item.getIsOrders());
+            goodsDemandVo.setLevelOneGoodsId(item.getLevelOneGoodsId());
+            goodsDemandVo.setAddressName(item.getAddressName());
+            goodsDemandVo.setPhone(item.getPhone());
+            goodsDemandVo.setName(item.getName());
 
             // 获取收购商发布需求中，关联的已确认的报价信息
             if(tbDemandQuotations.size() > 0) {

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

@@ -14,7 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * Model: tb_goods_demand -- 二级收购商需求发布表
- * @author yzs 
+ * @author yzs
  */
 @Data
 @Accessors(chain = true)
@@ -24,15 +24,15 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_goods_demand";	
+	public static final String TABLE_NAME = "tb_goods_demand";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-goods-demand";
 	public static final String PERMISSION_CODE_ADD = "tb-goods-demand-add";
@@ -44,48 +44,48 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 二级市场商家需求发布表主键ID 
+	 * 二级市场商家需求发布表主键ID
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;	
+	private Long id;
 
 	/**
-	 * 一级市场海关允许售卖商品ID 
+	 * 一级市场海关允许售卖商品ID
 	 */
-	private Long levelOneGoodsId;	
+	private Long levelOneGoodsId;
 
 	/**
-	 * 商品名称 
+	 * 商品名称
 	 */
-	private String goodsName;	
+	private String goodsName;
 
 	/**
-	 * 商品图片 
+	 * 商品图片
 	 */
-	private String goodsImg;	
+	private String goodsImg;
 
 	/**
-	 * 二级市场商家ID 
+	 * 二级市场商家ID
 	 */
-	private Long purchaserId;	
+	private Long purchaserId;
 
 	/**
-	 * 商家名称 
+	 * 商家名称
 	 */
-	private String purchaserName;	
+	private String purchaserName;
 
 	/**
-	 * 已被接单 
+	 * 已被接单
 	 */
 	private Integer isOrders;
 
 	/**
-	 * 商品量(根据海关允许发布表的计量单位决定,例如:柜,KG,吨) 
+	 * 商品量(根据海关允许发布表的计量单位决定,例如:柜,KG,吨)
 	 */
-	private String goodsQuantity;	
+	private String goodsQuantity;
 
 	/**
-	 * 商家备注 
+	 * 商家备注
 	 */
 	private String remark;
 
@@ -100,7 +100,7 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	private String createName;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date createTime;
@@ -140,7 +140,7 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	private String goodsNo;
 
 	/**
-	 * 删除状态 
+	 * 删除状态
 	 */
 	private Integer deleteStatus;
 
@@ -174,5 +174,9 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	 */
 	private String name;
 
+	/**
+	 * 收购商是否确认:0=未确认,1=已确认
+	 */
+	private Integer isConfirm;
 
 }

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

@@ -7,17 +7,17 @@
 
 	<!-- ================================== 查询相关 ================================== -->
 	<!-- select id, level_one_goods_id, goods_name, goods_img, purchaser_id, purchaser_name, is_orders, goods_quantity, remark, create_time, delete_status from tb_goods_demand  -->
-	
+
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.tb_goods_demand.TbGoodsDemand"></resultMap>
-	
+
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select * 
-		from tb_goods_demand 
+		select *
+		from tb_goods_demand
 	</sql>
 
-	
+
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
@@ -35,6 +35,7 @@
 			<if test=' this.has("remark") '> and remark = #{remark} </if>
 			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("isConfirm") '> and is_confirm = #{isConfirm} </if>
 		</where>
 		order by
 		<choose>
@@ -56,14 +57,14 @@
 			<otherwise> id desc </otherwise>
 		</choose>
 	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
 
 </mapper>

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

@@ -73,4 +73,24 @@ public class GoodsDemandVo {
      */
     private Date goodsDemandTime;
 
+    /**
+     * 一级市场海关允许售卖商品ID
+     */
+    private Long levelOneGoodsId;
+
+    /**
+     * 收件地址
+     */
+    private String addressName;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 收件人姓名
+     */
+    private String name;
+
 }

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

@@ -2,6 +2,7 @@ package com.pj.tb_orders;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.pj.project4sp.SP;
+import com.pj.tb_goods_demand.vo.GoodsDemandVo;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,11 +27,8 @@ public class TbOrdersApiController {
 
 	/** 增 */
 	@RequestMapping("add")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
-	public AjaxJson add(TbOrders t){
-		tbOrdersService.add(t);
-		t = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
-		return AjaxJson.getSuccessData(t);
+	public AjaxJson add(GoodsDemandVo t){
+		return AjaxJson.toAjax(tbOrdersService.addByDetail(t));
 	}
 
 	/** 删 */

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

@@ -4,12 +4,19 @@ import java.util.Date;
 import java.util.List;
 
 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_goods_demand.TbGoodsDemand;
+import com.pj.tb_goods_demand.TbGoodsDemandService;
+import com.pj.tb_goods_demand.vo.GoodsDemandVo;
 import com.pj.tb_purchaser.TbPurchaser;
 import com.pj.tb_purchaser.TbPurchaserMapper;
 import com.pj.utils.so.SoMap;
@@ -33,6 +40,10 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 	TbOrdersMapper tbOrdersMapper;
 	@Autowired
 	private TbPurchaserMapper tbPurchaserMapper;
+	@Autowired
+	private LevelOneServerInterface levelOneServerInterface;
+	@Autowired
+	private TbGoodsDemandService goodsDemandService;
 
 	/** 增 */
 	void add(TbOrders t){
@@ -119,4 +130,45 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 
 		this.add(orders);
 	}
+
+	/** 增  二级市场订单*/
+	boolean addByDetail(GoodsDemandVo goodsDemandVo){
+		TbOrders orders = new TbOrders();
+
+		//查询商品基本信息
+		GoodsDto goodsDto = levelOneServerInterface.getByGoodsId(goodsDemandVo.getLevelOneGoodsId());
+		orders.setGoodsFrom(goodsDto.getSource());
+
+		//订单编号:EJSCDD=二级市场订单
+		orders.setOrderNo(SystemObject.getREFcode("EJSCDD", new Date()));
+		orders.setGoodsId(goodsDemandVo.getLevelOneGoodsId());
+		orders.setGoodsName(goodsDemandVo.getGoodsName());
+		orders.setConsigneeName(goodsDemandVo.getName());
+		orders.setConsigneePhone(goodsDemandVo.getPhone());
+		orders.setUnloadingAddress(goodsDemandVo.getAddressName());
+		//订单完成状态 (0=未完成,1=已完成)
+		orders.setOrderFinish(OrderStatus.ORDER_STATUS_ZERO.getCode());
+		//删除状态(0=禁用,1=启用)
+		orders.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+		//创建人
+		orders.setCreateBy(StpAPPUserUtil.getAPPLoginInfo().getLoginId());
+		orders.setCreateName(StpAPPUserUtil.getAPPLoginInfo().getLoginName());
+		orders.setCreateTime(new Date());
+
+		orders.setTradeAreaId(StpAPPUserUtil.getAPPLoginInfo().getTradeAreaId());
+
+
+		this.add(orders);
+
+		// 回写到收购商发布需求表，把收购商确认状态改为已确认
+		LambdaUpdateWrapper<TbGoodsDemand> wrapper = new LambdaUpdateWrapper();
+		//收购商是否确认:0=未确认,1=已确认
+		wrapper.set(TbGoodsDemand::getIsConfirm, 1);
+
+		wrapper.eq(TbGoodsDemand::getId, goodsDemandVo.getGoodsDemandId());
+		goodsDemandService.update(wrapper);
+
+
+		return true;
+	}
 }