Merge branch 'test6.9.16' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.16

@@ -9,6 +9,7 @@ import com.yohoufo.order.model.request.PaymentRequest;
 import com.yohoufo.order.service.IPaymentService;
 import com.yohoufo.order.service.IPaymentService;
 import com.yohoufo.order.utils.LoggerUtils;
 import com.yohoufo.order.utils.LoggerUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -18,7 +19,7 @@ import org.springframework.stereotype.Service;
 @Service
 @Service
 public class PayRefundService {
 public class PayRefundService {
 
 
-    private static final Logger logger = LoggerUtils.getPayConfirmLogger();
+    private static final Logger logger = LoggerFactory.getLogger(PayRefundService.class);
 
 
     @Autowired
     @Autowired
     private IPaymentService paymentService;
     private IPaymentService paymentService;

@@ -66,6 +66,7 @@ import com.yohoufo.order.utils.LoggerUtils;
 import com.yohoufo.order.utils.PaymentHelper;
 import com.yohoufo.order.utils.PaymentHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -97,8 +98,7 @@ public class PaymentServiceImpl implements IPaymentService {
         }
         }
     }
     }
 
 
-    private static final Logger logger = LoggerUtils.getPayConfirmLogger();
-
+    private static final Logger logger = LoggerFactory.getLogger(PaymentServiceImpl.class);
 
 
     @Autowired
     @Autowired
     OrderPaymentServiceFactory orderPaymentServiceFactory;
     OrderPaymentServiceFactory orderPaymentServiceFactory;

@@ -20,9 +20,9 @@ public class LoggerUtils {
         return buildByName("mqProducerLog");
         return buildByName("mqProducerLog");
     }
     }
 
 
-    public static Logger getPayConfirmLogger(){
-        return buildByName("payConfirmLog");
-    }
+//    public static Logger getPayConfirmLogger(){
+//        return buildByName("payConfirmLog");
+//    }
 
 
     public static Logger getSellerOrderLogger(){
     public static Logger getSellerOrderLogger(){
         return buildByName("sellerOrderLog");
         return buildByName("sellerOrderLog");

@@ -16,7 +16,7 @@ public final class SearchConstants {
          */
          */
         String PRODUCT_ID = "id";
         String PRODUCT_ID = "id";
 
 
-        String PRODUCT_ID_FILTER = "isIdFilter";
+        String PRODUCT_ID_FILTER = "isIdFilter";  // 搜索不支持此参数，UFO内部使用
 
 
 
 
         /**
         /**
@@ -99,6 +99,23 @@ public final class SearchConstants {
 
 
         String EXCLUDE_LIMIT = "isFilterLimitSale";
         String EXCLUDE_LIMIT = "isFilterLimitSale";
 
 
+
+        String showChannel = "showChannel";
     }
     }
 
 
+
+    public enum ShowChannelEnum {
+        SHOW_CHANNEL_UFO(0, "ufo有货商城"),
+        SHOW_CHANNEL_XIANYU(1, "闲鱼商城")
+        ;
+
+        private Integer value;
+
+        private String desc;
+
+        ShowChannelEnum(Integer value, String desc){
+            this.value = value;
+            this.desc = desc;
+        }
+    }
 }
 }

@@ -226,7 +226,7 @@ public class ProductSearchReq {
 	}
 	}
 
 
 	public ProductSearchReq setIsIdFilter(Integer type) {
 	public ProductSearchReq setIsIdFilter(Integer type) {
-        if (type != null && type.equals(Integer.valueOf(7))) {
+        if (type != null && type.equals(Integer.valueOf(7))) {     // 收藏，根据商品列表查询商品列表
             this.isIdFilter = "Y";
             this.isIdFilter = "Y";
         }
         }
         return this;
         return this;