Merge branch 'dev'

+package com.yohoufo.order.controller;
+
+import com.yohoufo.common.ApiResponse;
+import com.yohoufo.order.service.impl.AppraiseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author kun.wang
+ * @date 2018/9/25
+ */
+@RestController
+public class AppraiseController {
+
+    @Autowired
+    private AppraiseService appraiseService;
+
+    /**
+     * 商品鉴定不通过,鉴定中心寄回商品给卖家
+     * @param expressCompanyId 快递公司id
+     * @param orderCode 订单号
+     * @param wayBillCode 快递单号
+     * @return
+     */
+    @RequestMapping(params = "method=ufo.order.appraiseFail")
+    public ApiResponse appraiseFail(@RequestParam("expressCompanyId") Integer expressCompanyId,
+                                    @RequestParam("orderCode") Long orderCode, @RequestParam("wayBillCode") String wayBillCode) {
+        boolean result = appraiseService.appraiseFail(expressCompanyId, orderCode, wayBillCode);
+        return new ApiResponse.ApiResponseBuilder().code(200)
+                .data(result).message("").build();
+    }
+
+    /**
+     * 鉴定通过,鉴定中心发货给买家
+     * @param expressCompanyId
+     * @param orderCode
+     * @param wayBillCode
+     * @return
+     */
+    @RequestMapping(params = "method=ufo.order.appraiseSuccess")
+    public ApiResponse appraiseSuccess(@RequestParam("expressCompanyId") Integer expressCompanyId,
+                                       @RequestParam("orderCode") Long orderCode, @RequestParam("wayBillCode") String wayBillCode) {
+        boolean result = appraiseService.appraiseSuccess(expressCompanyId, orderCode, wayBillCode);
+        return new ApiResponse.ApiResponseBuilder().code(200)
+                .data(result).message("").build();
+    }
+
+}

@@ -4,7 +4,6 @@ import com.yohobuy.ufo.model.order.resp.ExpressInfoRespBo;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.order.model.response.AppraiseAddressResp;
 import com.yohoufo.order.model.response.AppraiseAddressResp;
 import com.yohoufo.order.service.IExpressInfoService;
 import com.yohoufo.order.service.IExpressInfoService;
-import com.yohoufo.order.service.impl.AppraiseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,8 +19,6 @@ public class ExpressInfoController {
     @Autowired
     @Autowired
     private IExpressInfoService expressInfoService;
     private IExpressInfoService expressInfoService;
 
 
-    @Autowired
-    private AppraiseService appraiseService;
 
 
     /**
     /**
      * 卖家发货到鉴定中心
      * 卖家发货到鉴定中心
@@ -37,37 +34,6 @@ public class ExpressInfoController {
         return new ApiResponse();
         return new ApiResponse();
     }
     }
 
 
-
-    /**
-     * 商品鉴定不通过,鉴定中心寄回商品给卖家
-     * @param expressCompanyId 快递公司id
-     * @param orderCode 订单号
-     * @param wayBillCode 快递单号
-     * @return
-     */
-    @RequestMapping(params = "method=ufo.order.appraiseFail")
-    public ApiResponse appraiseFail(@RequestParam("expressCompanyId") Integer expressCompanyId,
-                                    @RequestParam("orderCode") Long orderCode, @RequestParam("wayBillCode") String wayBillCode) {
-        boolean result = appraiseService.appraiseFail(expressCompanyId, orderCode, wayBillCode);
-        return new ApiResponse.ApiResponseBuilder().code(200)
-                .data(result).message("").build();
-    }
-
-    /**
-     * 鉴定通过,鉴定中心发货给买家
-     * @param expressCompanyId
-     * @param orderCode
-     * @param wayBillCode
-     * @return
-     */
-    @RequestMapping(params = "method=ufo.order.appraiseSuccess")
-    public ApiResponse appraiseSuccess(@RequestParam("expressCompanyId") Integer expressCompanyId,
-                                       @RequestParam("orderCode") Long orderCode, @RequestParam("wayBillCode") String wayBillCode) {
-        boolean result = appraiseService.appraiseSuccess(expressCompanyId, orderCode, wayBillCode);
-        return new ApiResponse.ApiResponseBuilder().code(200)
-                .data(result).message("").build();
-    }
-
     /**
     /**
      * 查询快递详情
      * 查询快递详情
      * @param orderCode
      * @param orderCode

@@ -58,7 +58,7 @@ public class PaymentServiceImpl implements IPaymentService {
     OrderCodeGenerator orderCodeGenerator;
     OrderCodeGenerator orderCodeGenerator;
 
 
     @Autowired
     @Autowired
-    WeixinPayAppService weixinPayAppService;
+    WeixinPayBlkAppService weixinPayAppService;
 
 
     @Autowired
     @Autowired
     AlipayOuyinService alipayService;
     AlipayOuyinService alipayService;