Authored by mali

Merge branch 'dev'

@@ -34,6 +34,7 @@ import com.yohoufo.order.model.response.PrepayResponse; @@ -34,6 +34,7 @@ import com.yohoufo.order.model.response.PrepayResponse;
34 import com.yohoufo.order.service.IPaymentService; 34 import com.yohoufo.order.service.IPaymentService;
35 import com.yohoufo.order.service.pay.alipay.AlipayOuyinService; 35 import com.yohoufo.order.service.pay.alipay.AlipayOuyinService;
36 import com.yohoufo.order.service.pay.weixin.WeixinPayUFOAppService; 36 import com.yohoufo.order.service.pay.weixin.WeixinPayUFOAppService;
  37 +import com.yohoufo.order.service.pay.weixin.WeixinPayUFORealAppService;
37 38
38 @RestController 39 @RestController
39 @RequestMapping(value = "/payment") 40 @RequestMapping(value = "/payment")
@@ -52,7 +53,7 @@ public class PaymentController { @@ -52,7 +53,7 @@ public class PaymentController {
52 IPaymentService paymentService; 53 IPaymentService paymentService;
53 54
54 @Autowired 55 @Autowired
55 - WeixinPayUFOAppService weixinPayAppService; 56 + WeixinPayUFORealAppService weixinPayAppService;
56 57
57 @Autowired 58 @Autowired
58 AlipayOuyinService alipayService; 59 AlipayOuyinService alipayService;