闲鱼订单

@@ -58,7 +58,17 @@ public class BuyerOrder implements Serializable {
 	private Integer sellerDeliveryDealAgain;//卖家的48小时发货物流
 	private Integer sellerDeliveryDealAgain;//卖家的48小时发货物流
 	private Integer activityType;   //活动类型  砍价 18
 	private Integer activityType;   //活动类型  砍价 18
 
 
-    public Integer getId() {
+	private Integer businessClient;  //渠道   1代表闲鱼
+
+	public Integer getBusinessClient() {
+		return businessClient;
+	}
+
+	public void setBusinessClient(Integer businessClient) {
+		this.businessClient = businessClient;
+	}
+
+	public Integer getId() {
 		return id;
 		return id;
 	}
 	}
 
 

@@ -146,4 +146,6 @@ public class BuyerOrderReq extends PageRequestBO{
 	private String startTimeStr;
 	private String startTimeStr;
 
 
 	private String endTimeStr;
 	private String endTimeStr;
+
+	private Integer businessClient;  //客户端渠道 1:咸鱼
 }
 }

@@ -22,12 +22,13 @@
       <result column="seller_delivery_deal" jdbcType="INTEGER" property="sellerDeliveryDeal" />
       <result column="seller_delivery_deal" jdbcType="INTEGER" property="sellerDeliveryDeal" />
       <result column="seller_delivery_deal_again" jdbcType="INTEGER" property="sellerDeliveryDealAgain" />
       <result column="seller_delivery_deal_again" jdbcType="INTEGER" property="sellerDeliveryDealAgain" />
       <result column="activity_type" jdbcType="INTEGER" property="activityType" />
       <result column="activity_type" jdbcType="INTEGER" property="activityType" />
+      <result column="business_client" jdbcType="INTEGER" property="businessClient" />
     </resultMap>
     </resultMap>
     
     
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id, uid, order_code, seller_uid, client_type, payment, payment_type, is_cancel,
         id, uid, order_code, seller_uid, client_type, payment, payment_type, is_cancel,
         amount, ship_fee, status, create_time, update_time, channel_no, attributes ,platform_delivery_status,
         amount, ship_fee, status, create_time, update_time, channel_no, attributes ,platform_delivery_status,
-        seller_delivery_status,seller_delivery_deal,seller_delivery_deal_again,activity_type
+        seller_delivery_status,seller_delivery_deal,seller_delivery_deal_again,activity_type,business_client
     </sql>
     </sql>
 
 
     <select id="selectByOrderCode" resultMap="BaseResultMap">
     <select id="selectByOrderCode" resultMap="BaseResultMap">
@@ -226,6 +227,9 @@
          and a.attributes != 9 
          and a.attributes != 9 
          and c.attributes!=9
          and c.attributes!=9
      </if>
      </if>
+     <if test="buyerOrderReq.business_client != null">
+         and a.business_client = #{buyerOrderReq.businessClient}
+     </if>
   </sql>
   </sql>
     
     
     <select id="selectTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.order.model.BuyerOrderReq">
     <select id="selectTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.order.model.BuyerOrderReq">

@@ -4442,6 +4442,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
     		resp.setChannel(Objects.equals(item.getAttributes(), 2) ? 2 : 1);	//1,线上订单; 2,门店订单
     		resp.setChannel(Objects.equals(item.getAttributes(), 2) ? 2 : 1);	//1,线上订单; 2,门店订单
     		resp.setProductNum(1);//目前固定为1
     		resp.setProductNum(1);//目前固定为1
 			resp.setActivityType(item.getActivityType());
 			resp.setActivityType(item.getActivityType());
+			resp.setBusinessClient(item.getBusinessClient());
 			if(null==sellerGoodsMap.get(skup)){
 			if(null==sellerGoodsMap.get(skup)){
 				LOGGER.warn("convertToResp not correct data,sellerGoodsMap get sku p {} is empty ,buyer order {}",skup,item);
 				LOGGER.warn("convertToResp not correct data,sellerGoodsMap get sku p {} is empty ,buyer order {}",skup,item);
 			}else{
 			}else{
@@ -4675,6 +4676,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 				req.setAttributesNotList(Arrays.asList(2));	//排除掉门店自提
 				req.setAttributesNotList(Arrays.asList(2));	//排除掉门店自提
 			} else if (req.getChannel().equals("2")) {
 			} else if (req.getChannel().equals("2")) {
     			req.setAttributesList(Arrays.asList(2));
     			req.setAttributesList(Arrays.asList(2));
+			} else if (req.getChannel().equals("3")) {   //  查询闲鱼订单
+				req.setBusinessClient(1);
 			}
 			}
 		}
 		}
 
 

@@ -100,6 +100,7 @@
                 <option value="">全部</option>
                 <option value="">全部</option>
                 <option value="1">线上发货</option>
                 <option value="1">线上发货</option>
                 <option value="2">门店自提</option>
                 <option value="2">门店自提</option>
+                <option value="3">闲鱼</option>
             </select>
             </select>
             
             
             <br><br>
             <br><br>
@@ -273,6 +274,9 @@ function getOrderList(){
                 if (rowData.activityType == 18) {
                 if (rowData.activityType == 18) {
                     return "[砍价订单]" + rowData.orderCode;
                     return "[砍价订单]" + rowData.orderCode;
                 }
                 }
+                if (rowData.businessClient == 1) {
+                    return "[闲鱼]" + rowData.orderCode;
+                }
 
 
                 return rowData.orderCode;
                 return rowData.orderCode;
             }
             }