Merge remote-tracking branch 'origin/saas' into saas

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

@@ -1147,8 +1147,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         
 		if (studentInfo.getTenantId() == 1) {
 			if (OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
-				params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
-				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
+				//params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
+				//params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
 			} else {
 				params.put("compayName", "武汉长乐长风乐器销售有限公司");
 				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png");

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

@@ -151,22 +151,29 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         }
         log.info("delayCheckTenant  checkTenantOrder>>>>>");
         List<TenantOrderRecord> list = this.list(new WrapperUtil<TenantOrderRecord>().queryWrapper()
-                .isNotNull("trans_no_")
                 .eq("order_state_", 0));
         if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(record -> {
-                checkTransOrderState(record);
-                if (record.getOrderState() == 1) {
-                    Consumer<TenantOrderRecord> consumer = checkOrder.get(record.getOrderType());
-                    if (Objects.isNull(consumer)) {
+                if (StringUtils.isBlank(record.getTransNo())) {
+                    if (timeOutCheck(record.getCreatedTime())) {
+                        record.setOrderState(2);
+                    } else {
                         return;
                     }
-                    consumer.accept(record);
-                    //修改流水
-                    LocalDateTime now = LocalDateTime.now();
-                    record.setPayDate(now.toLocalDate().toDate());
-                    record.setPayTime(now.toDate());
+                } else {
+                    checkTransOrderState(record);
+                    if (record.getOrderState() == 1) {
+                        Consumer<TenantOrderRecord> consumer = checkOrder.get(record.getOrderType());
+                        if (Objects.isNull(consumer)) {
+                            return;
+                        }
+                        consumer.accept(record);
+                    }
                 }
+                //修改流水
+                LocalDateTime now = LocalDateTime.now();
+                record.setPayDate(now.toLocalDate().toDate());
+                record.setPayTime(now.toDate());
                 baseMapper.updateById(record);
             });
         }
@@ -278,11 +285,7 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
                         //不等于这个异常都是失败
                         orderRecord.setOrderState(2);
                     } else {
-                        long orderTime = orderRecord.getCreatedTime().getTime();//订单创建时间
-                        long nowTime = new Date().getTime();
-                        //丢弃5分钟之前的订单 300000 = 5 * 60秒 * 1000
-                        long exTime = 300000L;
-                        if (nowTime - orderTime > exTime) {
+                        if (timeOutCheck(orderRecord.getCreatedTime())) {
                             orderRecord.setOrderState(2);
                         }
                     }
@@ -295,6 +298,15 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         }
     }
 
+    //超时返回true
+    private Boolean timeOutCheck(Date orderDate) {
+        long orderTime = orderDate.getTime();//订单创建时间
+        long nowTime = new Date().getTime();
+        //丢弃5分钟之前的订单 300000 = 5 * 60秒 * 1000
+        long exTime = 300000L;
+        return nowTime - orderTime > exTime;
+    }
+
     private void getOrderState(TenantOrderRecord orderRecord, Map<String, Object> result) {
         Map<String, Object> detail = (Map<String, Object>) result.get("detail");
         Map<String, Object> order = (Map<String, Object>) result.get("order");

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

@@ -513,9 +513,6 @@
             <if test="status!=null">
                 AND status_=#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
-            <if test="tenantId!=null">
-                AND cgsm.tenant_id_=#{tenantId}
-            </if>
         </where>
     </select>
     <select id="getStudentEducationalTeachers" resultType="com.ym.mec.biz.dal.dto.StudentEduTeacherDto">

mec-web/src/main/java/com/ym/mec/web/controller/AppRedemptionCodeController.java

@@ -1,17 +1,21 @@
 package com.ym.mec.web.controller;
 
+import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.AppRedemptionCode;
 import com.ym.mec.biz.service.AppRedemptionCodeService;
-import com.ym.mec.common.entity.HttpResponseResult;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
 import com.ym.mec.common.controller.BaseController;
-
-import javax.annotation.Resource;
+import com.ym.mec.common.entity.HttpResponseResult;
 
 /**
  * 兑换码分配表(RedemptionCode)表控制层
@@ -33,7 +37,6 @@ public class AppRedemptionCodeController extends BaseController {
 
     @ApiOperation(value = "分配url")
     @GetMapping(value = "allocation")
-    @PreAuthorize("@pcs.hasPermissions('appRedemptionCode/allocation')")
     public HttpResponseResult<AppRedemptionCode> allocation(@RequestParam("userId")Integer userId) throws Exception {
         if (userId == null) {
             throw new Exception("用户Id必须填写");