砍价优化

@@ -58,11 +58,20 @@ public class BuyerOrder implements Serializable {
 
 	private Integer sellerDeliveryDeal;//卖家的24小时发货物流,操作员是否已经处理：0：未处理  ，1 ：24小时已处理 ，
 	private Integer sellerDeliveryDealAgain;//卖家的48小时发货物流
+	private Integer activityType;   //活动类型  砍价 18
 
     public Integer getId() {
 		return id;
 	}
 
+	public Integer getActivityType() {
+		return activityType;
+	}
+
+	public void setActivityType(Integer activityType) {
+		this.activityType = activityType;
+	}
+
 	public void setId(Integer id) {
 		this.id = id;
 	}

@@ -21,12 +21,13 @@
       <result column="seller_delivery_status" jdbcType="INTEGER" property="sellerDeliveryStatus" />
       <result column="seller_delivery_deal" jdbcType="INTEGER" property="sellerDeliveryDeal" />
       <result column="seller_delivery_deal_again" jdbcType="INTEGER" property="sellerDeliveryDealAgain" />
+      <result column="activity_type" jdbcType="INTEGER" property="activityType" />
     </resultMap>
     
     <sql id="Base_Column_List">
         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,
-        seller_delivery_status,seller_delivery_deal,seller_delivery_deal_again
+        seller_delivery_status,seller_delivery_deal,seller_delivery_deal_again,activity_type
     </sql>
 
     <select id="selectByOrderCode" resultMap="BaseResultMap">

@@ -1610,6 +1610,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	resp.setClientTypeStr(convertClientType(buyerOrder.getClientType()));
     	resp.setPayment(convertPayment(buyerOrder.getPayment()));
 		resp.setAttributes(buyerOrder.getAttributes());
+		resp.setActivityType(buyerOrder.getActivityType());
     	//支付时间
     	if(null != buyerOrder.getPayment()) {
     		OrdersPay ordersPay = ordersPayMapper.selectByOrderCode(buyerOrder.getOrderCode());
@@ -2556,6 +2557,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     		resp.setChannel(Objects.equals(item.getAttributes(), 2) ? 2 : 1);	//1,线上订单; 2,门店订单
     		resp.setProductNum(1);//目前固定为1
 			resp.setAttributesStr(OrderConfigConstant.getOrderAttributeStr(item.getAttributes()));
+			resp.setActivityType(item.getActivityType());
 			if(null==sellerGoodsMap.get(skup)){
 				LOGGER.warn("convertToResp not correct data,sellerGoodsMap get sku p {} is empty ,buyer order {}",skup,item);
 			}else{

@@ -57,6 +57,7 @@
               </tr>
               <tr>
                 <td><label>订单类型：</label><span id="preSellOrNormal"></span></td>
+                <td><label>促销活动：</label><span id="activityType"></span></td>
               </tr>
 		    </table>
 		    
@@ -462,7 +463,10 @@ function getOrderInfo(orderCode){
                      attributesStr = '二手';
                  }
             	 $("#preSellOrNormal").html(attributesStr);
-            	 
+                 if (result.data.activityType == 18) {
+                     $("#activityType").html('砍价');
+                 }
+
             	 //收货信息
             	 //鉴定前，买家可联系客服修改收货信息
                  if(result.data.status==1 ||result.data.status==2 ||result.data.status==31){

@@ -243,6 +243,10 @@ function getOrderList(){
                 if(rowData.channel == 2){
                     return "[门店订单]" + rowData.orderCode;
                 }
+                if (rowData.activityType == 18) {
+                    return "[砍价订单]" + rowData.orderCode;
+                }
+
                 return rowData.orderCode;
             }
         },  {