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

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

@@ -77,16 +77,18 @@ public class MethodGoodsDemandService {
             goodsDemandVo.setAddressName(item.getAddressName());
             goodsDemandVo.setPhone(item.getPhone());
             goodsDemandVo.setName(item.getName());
+            goodsDemandVo.setIsConfirm(item.getIsConfirm());
 
             // 获取收购商发布需求中，关联的已确认的报价信息
             if(tbDemandQuotations.size() > 0) {
                 TbDemandQuotation tbDemandQuotation = tbDemandQuotations.get(0);
                 goodsDemandVo.setDemandQuotationId(tbDemandQuotation.getId());
-                goodsDemandVo.setCreateName(tbDemandQuotation.getCreateName());
                 goodsDemandVo.setCreateTime(tbDemandQuotation.getCreateTime());
                 goodsDemandVo.setQuotation(tbDemandQuotation.getQuotation());
                 goodsDemandVo.setRemark(tbDemandQuotation.getRemark());
                 goodsDemandVo.setGroupName(tbDemandQuotation.getGroupName());
+                goodsDemandVo.setLeaderId(tbDemandQuotation.getLeaderId());
+                goodsDemandVo.setCreateName(tbDemandQuotation.getCreateName());
             }
 
             //执行添加

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

@@ -23,10 +23,7 @@ public class GoodsDemandVo {
      */
     private Long demandQuotationId;
 
-    /**
-     * 边民组ID
-     */
-    private Long groupId;
+
 
     /**
      * 商品名称
@@ -38,11 +35,19 @@ public class GoodsDemandVo {
      */
     private String goodsImg;
     /**
-     *  报价的组名
+     * 组Id
+     */
+    private Long groupId;
+    /**
+     *  组名
      */
     private String groupName;
     /**
-     * 报价的组长名
+     * 组长Id
+     */
+    private Long leaderId;
+    /**
+     * 组长名
      */
     private String createName;
     /**
@@ -93,4 +98,8 @@ public class GoodsDemandVo {
      */
     private String name;
 
+    /**
+     * 收购商是否确认:0=未确认,1=已确认
+     */
+    private Integer isConfirm;
 }

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

@@ -201,7 +201,10 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	 */
 	private String purchaserName;
 
-
+	/**
+	 * 组长Id
+	 */
+	private Long leaderId;
 
 
 

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

@@ -7,17 +7,17 @@
 
 	<!-- ================================== 查询相关 ================================== -->
 	<!-- select id, level_one_order_id, order_no, goods_id, goods_name, goods_from, shipper_phone, shipper_name, driver_id, driver_name, driver_phone, car_id, car_type, consignee_name, consignee_phone, declaration_number, order_finish, loading_address, unloading_address, comment, update_time, create_time, update_name, delete_status, update_by, create_by, create_name, trade_area_id, trade_area_name from tb_orders  -->
-	
+
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.tb_orders.TbOrders"></resultMap>
-	
+
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select * 
-		from tb_orders 
+		select *
+		from tb_orders
 	</sql>
 
-	
+
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
@@ -52,6 +52,7 @@
 			<if test=' this.has("createName") '> and create_name = #{createName} </if>
 			<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>
 		</where>
 		order by
 		<choose>
@@ -87,14 +88,14 @@
 			<otherwise> id desc </otherwise>
 		</choose>
 	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
 
 </mapper>

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

@@ -146,6 +146,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		orders.setConsigneeName(goodsDemandVo.getName());
 		orders.setConsigneePhone(goodsDemandVo.getPhone());
 		orders.setUnloadingAddress(goodsDemandVo.getAddressName());
+		orders.setLeaderId(goodsDemandVo.getLeaderId());
 		//订单完成状态 (0=未完成,1=已完成)
 		orders.setOrderFinish(OrderStatus.ORDER_STATUS_ZERO.getCode());
 		//删除状态(0=禁用,1=启用)