Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

mec-biz/src/main/java/com/ym/mec/biz/service/CloudTeacherOrderService.java

@@ -106,7 +106,7 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
 
     Msg payNotify(Msg msg) throws Exception;
 
-    Boolean payCheck(TenantOrderRecord record);
+    Boolean payCheck(TenantOrderRecord record, int i);
 
     Boolean payCheck(String orderNo) throws Exception;
 

mec-biz/src/main/java/com/ym/mec/biz/service/TenantOrderRecordService.java

@@ -23,6 +23,6 @@ public interface TenantOrderRecordService extends IService<TenantOrderRecord> {
 
     void checkTenantOrder();
 
-    Boolean rechargeCheck(TenantOrderRecord record);
+    Boolean rechargeCheck(TenantOrderRecord record, int i);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CloudTeacherOrderServiceImpl.java

@@ -268,18 +268,18 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     @Override
-    public Boolean payCheck(TenantOrderRecord record) {
+    public Boolean payCheck(TenantOrderRecord record, int i) {
         RBucket<Object> bucket = redissonClient.getBucket("tenant_check_order");
         if (!bucket.trySet(1, 3L, TimeUnit.SECONDS)) {
             return false;
         }
-        log.info("checkCloudTeacherOrder check >>>>>");
+        log.info("  云教练 支付 check >>>>> {} ", i);
         checkTransOrderState(record);
         if (record.getOrderState() == 1) {
             tenantOrderRecordService.updateById(record);
             try {
                 this.paySuccess(record); // 充值成功
-                log.info("checkCloudTeacherOrder check success >>>>>");
+                log.info("  云教练 支付 成功 >>>>> {}", i);
                 return true;
             } catch (Exception e) {
                 e.printStackTrace();
@@ -287,7 +287,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             }
         }
         bucket.delete();
-        log.info("checkCloudTeacherOrder check fail >>>>>");
+        log.info(" 云教练 支付 失败 >>>>> ", i);
         return false;
     }
 
@@ -309,7 +309,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             Map<String, Object> payment;
             try {
                 payment = Payment.queryPayment(orderRecord.getTransNo());
-                log.info("checkCloudTeacherOrder  payment >>>>> {}", payment);
+                log.info("    >>>>> payment 云教练 >>>>>");
                 String status = (String) payment.get("status");
                 //判断状态是成功还是失败
                 if (status.equals("succeeded")) {
@@ -329,10 +329,10 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
                         }
                     }
                 }
-                log.info("checkCloudTeacherOrder  payment >>>>> {}", payment);
-                log.info("checkCloudTeacherOrder  orderRecord >>>>> {}", JSON.toJSONString(orderRecord));
+                log.info("     >>>>> payment 云教练  >>>>> {}", payment);
+                log.info("     >>>>> payment 云教练  >>>>> {}", JSON.toJSONString(orderRecord));
             } catch (Exception e) {
-                log.error("checkCloudTeacherOrder  payment error>>>>> {}", JSON.toJSONString(orderRecord));
+                log.error("     >>>>> payment 云教练  >>>>> {}", JSON.toJSONString(orderRecord));
             }
         }
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrderPayOpsServiceImpl.java

@@ -277,14 +277,14 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         CompletableFuture.runAsync(() -> {
             //检查5次
             Boolean ret = false;
-            for (int i = 0; i <= 100; i++) { // 检查5分钟
+            for (int i = 0; i <= 20; i++) { // 检查5分钟
                 try {
-                    ret = cloudTeacherOrderService.payCheck(record);
+                    ret = cloudTeacherOrderService.payCheck(record, i);
                     if (ret) break;
                     Thread.sleep(3000);//每3秒触发一次
-                    log.info("delayCheckCloudTeacherOrder >>>>>  start {}", i);
+                    log.info("云教练 支付 重试>>>>>  start {}", i);
                 } catch (Exception e) {
-                    log.info("delayCheckCloudTeacherOrder exception  ", e);
+                    log.info("云教练 支付 异常  ", e.toString());
                     e.printStackTrace();
                 }
             }
@@ -305,13 +305,14 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         //异步
         CompletableFuture.runAsync(() -> {
             //检查5次
-            for (int i = 0; i <= 100; i++) { // 检查5分钟
+            for (int i = 0; i <= 20; i++) { // 检查5分钟
                 try {
-                    Boolean ret = tenantOrderRecordService.rechargeCheck(record);
+                    Boolean ret = tenantOrderRecordService.rechargeCheck(record, i);
                     if (ret) break;
                     Thread.sleep(3000); // 每3秒触发一次
-                    log.info("executePayment 重试 >>>>>  start {}", i);
+                    log.info("机构充值 重试 >>>>>  start {}", i);
                 } catch (InterruptedException e) {
+                    log.info("机构充值 异常 >>>>>  start {}", e.toString());
                     return;
                 }
             }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantOrderRecordServiceImpl.java

@@ -154,7 +154,7 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
             Map<String, Object> payment;
             try {
                 payment = Payment.queryPayment(orderRecord.getTransNo());
-                log.info("checkTenantOrder  payment >>>>> {}", payment);
+                log.info("    >>>>> checkTenantOrder  payment start");
                 String status = (String) payment.get("status");
                 //判断状态是成功还是失败
                 if (status.equals("succeeded")) {
@@ -174,10 +174,10 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
                         }
                     }
                 }
-                log.info("checkTenantOrder  payment >>>>> {}", payment);
-                log.info("checkTenantOrder  orderRecord >>>>> {}", JSON.toJSONString(orderRecord));
+                log.info("    >>>>> checkTenantOrder  payment >>>>> {}", payment);
+                log.info("    >>>>> checkTenantOrder  orderRecord >>>>> {}", JSON.toJSONString(orderRecord));
             } catch (Exception e) {
-                log.error("checkTenantOrder  payment error>>>>> {}", JSON.toJSONString(orderRecord));
+                log.error("    >>>>> checkTenantOrder  payment error>>>>> {}", JSON.toJSONString(orderRecord));
             }
         }
     }
@@ -248,17 +248,17 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
     }
 
     @Override
-    public Boolean rechargeCheck(TenantOrderRecord record) {
+    public Boolean rechargeCheck(TenantOrderRecord record, int i) {
         RBucket<Object> bucket = redissonClient.getBucket("tenant_check_order");
         if (!bucket.trySet(1, 3L, TimeUnit.SECONDS)) {
             return false;
         }
-        log.info("checkRechargeCheck  rechargeCheck>>>>>");
+        log.info("    机构充值 {} rechargeCheck>>>>>", i);
         checkTransOrderState(record);
         if (record.getOrderState() == 1) {
             baseMapper.updateById(record);
             try {
-                log.info("checkRechargeCheck  rechargeSuccess>>>>>");
+                log.info("    机构充值 {} rechargeSuccess>>>>>", i);
                 this.rechargeSuccess(record); // 充值成功
                 return true;
             } catch (Exception e) {

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -503,7 +503,7 @@
         <where>
         	t.tenant_id_ = #{tenantId}
             <if test="userIds != null">
-                and su.id_ IN
+                AND su.id_ IN
                 <foreach collection="userIds" separator="," open="(" close=")" item="item">
                     #{item}
                 </foreach>