Merge remote-tracking branch 'origin/dev' into dev

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsMapper.xml

@@ -65,7 +65,7 @@
 		select g.* from tb_goods g
 		left join re_trade_area_goods ta on g.id = ta.goods_id
 		where ta.area_id = #{tradeAreaId}
-
+		<if test=' this.has("typeNames") '> and g.type_names = #{typeNames} </if>
 	</select>
 
 

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

@@ -1,6 +1,7 @@
 package com.pj.tb_goods_transit;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.current.config.SystemObject;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.enummj.*;
 import com.pj.retry.SmsRetryService;
@@ -122,7 +123,7 @@ public class MethodGoodsTransitService {
         tbOrder.setTradeAreaName(tbGoodsTransit.getTradeAreaName());
         tbOrder.setGoodsId(tbGoodsTransit.getId());
         tbOrder.setSaleMainId(Long.valueOf(tbGoodsTransit.getMerchantId()));
-//		tbOrder.setTradeNo();  // 交易编号
+		tbOrder.setTradeNo(SystemObject.getREFcode("YJSCDD",new Date()));  // 交易编号
         tbOrder.setBuyUserId(tbPeopleList.get(0).getId());
         tbOrder.setBuyUserType(2 + "");
         tbOrder.setBuyUserName(appLoginInfo.getLoginName());

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

@@ -54,12 +54,14 @@ public class MethodOrdersService {
             LambdaQueryWrapper<TbDemandQuotation> wrapper = new LambdaQueryWrapper();
             wrapper.eq(TbDemandQuotation::getDemandId, goodsDemandId);
             wrapper.eq(TbDemandQuotation::getQuotationResult, 1);
-            TbDemandQuotation demandQuotation = demandQuotationService.getOne(wrapper);
-            // 商品报价
-            ordersDto.setQuotation(demandQuotation.getQuotation());
-            // 商品报价人
-            ordersDto.setQuotationPerson(demandQuotation.getCreateName());
-
+            wrapper.orderByDesc(TbDemandQuotation::getCreateTime);
+            List<TbDemandQuotation> demandQuotationList = demandQuotationService.list(wrapper);
+            if(demandQuotationList.size()>0) {
+                // 商品报价
+                ordersDto.setQuotation(demandQuotationList.get(0).getQuotation());
+                // 商品报价人
+                ordersDto.setQuotationPerson(demandQuotationList.get(0).getCreateName());
+            }
 
             ordersDtoList.add(ordersDto);
         });

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

@@ -200,6 +200,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		//收购商是否确认:0=未确认,1=已确认
 		wrapper2.set(TbDemandQuotation::getQuotationResult, 1);
 		wrapper2.eq(TbDemandQuotation::getDemandId, goodsDemandVo.getGoodsDemandId());
+		wrapper2.eq(TbDemandQuotation::getQuotationResult, 0);
 		boolean update2 = demandQuotationService.update(wrapper2);
 
 		//todo:给组长发一条已确认接单消息