Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -47,6 +47,9 @@ public class YqPayController extends BaseController {
     @Autowired
     private CourseGroupInfoService CourseGroupInfoService;
 
+    @Autowired
+    private ApplyInfoService applyInfoService;
+
 
     /**
      * 统一下单(乐团缴费)
@@ -186,6 +189,7 @@ public class YqPayController extends BaseController {
     @ApiOperation(value = "续费支付", notes = "易乾支付统一下单")
     @PostMapping("/renewalsPay")
     @Transactional
+    //applyInfoService.queryUserCourse(userId) //获取续费课程
 //    public Object renewalsPay(@ModelAttribute @Validated Renewals renewals) throws Exception {
 //        BigDecimal amount = new BigDecimal("0");
 //
@@ -453,6 +457,8 @@ public class YqPayController extends BaseController {
                 order.setPayTime(new Date());
             }
             orderService.update(order);
+            ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
+            applyInfoService.userRegister(applyInfo.getPatriarchPhone()); //推送mec
 
             msg.setCode("000000");
             msg.setMsg("success");

src/main/resources/application.yml

@@ -48,6 +48,8 @@ spring:
         min-idle: 0
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
+#   configuration:
+#      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     
 logging:
   config: classpath:logback-spring.xml