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

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

@@ -70,7 +70,7 @@ public class YqPayController extends BaseController {
      */
 //    @ApiOperation(value = "提交支付", notes = "易乾支付统一下单")
     @PostMapping("/toPay")
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Object toPay(@ModelAttribute @Validated Order order) throws Exception {
         logger.info(order.toString());
         BigDecimal amount = new BigDecimal("0");
@@ -180,7 +180,6 @@ public class YqPayController extends BaseController {
      */
 //    @ApiOperation(value = "续费支付", notes = "续费支付")
     @PostMapping("/renewalsPay")
-
     public Object renewalsPay(@ModelAttribute @Validated Renewals renewals) throws Exception {
         MecUser mecUser = applyInfoService.findMecUser(renewals.getUserId());
         if (mecUser == null) {
@@ -425,7 +424,7 @@ public class YqPayController extends BaseController {
         }
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void updateOrder(Map<String, String> rpMap) throws Exception {
         int status = rpMap.get("tradeState").equals("1") ? 2 : 0;
         Order order = orderService.getOrderByOrderNo(rpMap.get("merOrderNo"));
@@ -452,7 +451,7 @@ public class YqPayController extends BaseController {
         }
         if (status == 0) {
             //失败减去已收款金额
-            Account account = accountService.getAccountByBranchId(Integer.parseInt(order.getUAccount()));
+            Account account = accountService.get(Integer.parseInt(order.getUAccount()));
             BigDecimal HasRouting = account.getHasRouting().subtract(order.getAmount());
             account.setHasRouting(HasRouting);
             accountService.upByIdAndVersion(account);
@@ -486,7 +485,7 @@ public class YqPayController extends BaseController {
         }
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void failOrders(ArrayList<String> orderNoList) throws Exception {
         if (orderNoList.size() == 0) {
             return;

src/main/resources/application.yml

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