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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantOrderRecordDao.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ym.mec.biz.dal.dto.TenantOrderRecordDto;
 import com.ym.mec.biz.dal.entity.TenantOrderRecord;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,6 +22,8 @@ public interface TenantOrderRecordDao extends BaseMapper<TenantOrderRecord> {
     int insertBatch(@Param("entities") List<TenantOrderRecord> entities);
 
     <T> IPage<T> queryPage(Page<T> page, @Param("param") TenantOrderRecordDto dto);
+    
+    TenantOrderRecord getLockedById(Integer id);
 
 }
 

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

@@ -1011,7 +1011,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
             return;
         }
 
-        String organCode = tenantInfo == null ? organizationDto.getCorporateCode() : tenantInfo.getTsignCode();
+        String organCode = organizationDto.getCorporateCode() == null ? tenantInfo.getTsignCode() : organizationDto.getCorporateCode();
         
 		if (user.getTenantId() == 1) {
 			if (!OwnershipType.OWN.name().equals(params.get("ownershipType"))) {

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import java.io.File;
 import java.util.Date;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -41,6 +42,8 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
     @Value("${spring.profiles.active:dev}")
     private String env;
 
+	private String cardName;
+
     @Override
     public BaseDAO<Integer, HfMember> getDAO() {
         return hfMemberDao;
@@ -166,10 +169,20 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         if (!hfMember.getStatus().equals("succeeded")) {
             throw new BizException("商户审核通过，才能绑定结算卡");
         }
-        hfMember.setCardNo(accountInfo.getCardId());
+        /*hfMember.setCardNo(accountInfo.getCardId());
         hfMember.setBankCode(accountInfo.getBankCode());
         hfMember.setBankAcctType(accountInfo.getBankAcctType());
-        hfMember.setCardName(accountInfo.getCardName());
+        hfMember.setCardName(accountInfo.getCardName());*/
+        
+        accountInfo.setAreaCode(hfMember.getAreaCode());
+        accountInfo.setBankAcctType(hfMember.getBankAcctType());
+        accountInfo.setBankCode(hfMember.getBankCode());
+        accountInfo.setBankName(hfMember.getBankCode());
+        accountInfo.setCardId(hfMember.getCardNo());
+        accountInfo.setCardName(hfMember.getCardName());
+        accountInfo.setMemberId(memberId);
+        accountInfo.setProvCode(hfMember.getProvCode());
+        accountInfo.setTelNo(hfMember.getLegalMp());
         
         Integer tenantId = hfMember.getTenantId();
         

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

@@ -356,6 +356,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     public void updateOrder(Map<String, String> rpMap) throws Exception {
         DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
         StudentPaymentOrder order = findOrderByOrderNo(rpMap.get("merOrderNo"));
+        order = studentPaymentOrderDao.lockOrder(order.getId());
         //关闭或失败的订单查询订单成功,订单改成成功，钱退到余额
         if (order != null && (order.getStatus().equals(DealStatusEnum.CLOSE) || order.getStatus().equals(DealStatusEnum.FAILED)) && status.equals(DealStatusEnum.SUCCESS)) {
             String memo = order.getStatus().equals(DealStatusEnum.CLOSE) ? "关闭订单" : "失败订单";

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

@@ -1109,10 +1109,10 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
 
     @Override
     public Map<String, Object> recharge(Integer tenantId, BigDecimal amount) throws Exception {
-        SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
+        /*SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
         if (Objects.isNull(config)) {
             throw new BizException("未查询到机构收款分部信息！");
-        }
+        }*/
         log.error("机构 " + tenantId.toString() + "充值");
         Optional.of(tenantId)
                 .map(baseMapper::selectById)

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

@@ -106,6 +106,9 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
 
     @Autowired
     private HfMerchantConfigService hfMerchantConfigService;
+    
+    @Autowired
+    private TenantOrderRecordDao tenantOrderRecordDao;
 
     //订单不存在
     private static final String PAYMENT_ID_NOT_EXISTS = "payment_id_not_exists";
@@ -459,6 +462,7 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
                     log.error("error tenant callback request orderNo is null param:{}", data);
                     return "failed";
                 }
+                record = tenantOrderRecordDao.getLockedById(record.getId());
                 //只处理未支付状态的订单
                 if(!record.getOrderState().equals(0)){
                     return "succeeded";

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

@@ -393,21 +393,21 @@
 		SELECT COUNT(cssp.user_id_) FROM (
 		<if test="groupType == 'VIP'">
 			SELECT cssp.user_id_,MIN(vg.create_time_) first_order_time_,MAX(vg.create_time_) last_order_time_ FROM course_schedule_student_payment cssp
-			LEFT JOIN vip_group vg ON vg.id_ = cssp.music_group_id_
+			LEFT JOIN vip_group vg ON CONVERT(vg.id_ , CHAR) = cssp.music_group_id_
 			LEFT JOIN vip_group_category vgc ON vgc.id_ = vg.vip_group_category_id_
 			WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'VIP' AND vgc.music_theory_ = 0 AND DATE_FORMAT(vg.create_time_, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
 			GROUP BY cssp.user_id_
 		</if>
 		<if test="groupType == 'THEORY'">
 			SELECT cssp.user_id_,MIN(vg.create_time_) first_order_time_,MAX(vg.create_time_) last_order_time_ FROM course_schedule_student_payment cssp
-			LEFT JOIN vip_group vg ON vg.id_ = cssp.music_group_id_
+			LEFT JOIN vip_group vg ON CONVERT(vg.id_ , CHAR) = cssp.music_group_id_
 			LEFT JOIN vip_group_category vgc ON vgc.id_ = vg.vip_group_category_id_
 			WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'VIP' AND vgc.music_theory_ AND DATE_FORMAT(vg.create_time_, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
 			GROUP BY cssp.user_id_
 		</if>
 		<if test="groupType == 'PRACTICE'">
 			SELECT cssp.user_id_,MIN(pg.create_time_) first_order_time_,MAX(pg.create_time_) last_order_time_ FROM course_schedule_student_payment cssp
-			LEFT JOIN practice_group pg ON pg.id_ = cssp.music_group_id_
+			LEFT JOIN practice_group pg ON CONVERT(pg.id_ , CHAR) = cssp.music_group_id_
 			WHERE cssp.actual_price_ > 0 AND cssp.group_type_ = 'PRACTICE' AND DATE_FORMAT(pg.create_time_, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
 			GROUP BY cssp.user_id_
 		</if> ) cssp

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

@@ -22,6 +22,10 @@
         id_
         , tenant_id_, order_no_, trans_no_, order_type_, payment_channel_, pay_channel_, expect_amount, actual_amount, mer_nos_, order_state_, pay_date_, pay_time_, created_time_
     </sql>
+    
+    <select id="getLockedById" resultMap="BaseResultMap">
+    	select * from tenant_order_record where id_ = #{id} for update
+    </select>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.ym.mec.biz.dal.entity.TenantOrderRecord">

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
@@ -178,4 +179,5 @@ public class TeacherController extends BaseController {
         queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(teacherService.queryTeacherMusicStudentOverView(queryInfo));
     }
+
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -1,7 +1,9 @@
 package com.ym.mec.teacher.controller;
 
 import com.ksyun.ks3.dto.PostObjectFormFields;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.enums.SuggestionType;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.thirdparty.entity.UploadSign;
 import io.swagger.annotations.*;
@@ -18,17 +20,11 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SysSuggestionService;
-import com.ym.mec.biz.service.SysUserBankCardService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
-import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.util.upload.UploadUtil;
 
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "教师管理")
@@ -49,6 +45,8 @@ public class TeacherManageController extends BaseController {
     private SysUserBankCardService sysUserBankCardService;
     @Autowired
     private StudentRegistrationService studentRegistrationService;
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(TeacherManageController.class);
 
@@ -208,4 +206,11 @@ public class TeacherManageController extends BaseController {
     public Object getStudentDetail(Integer studentId){
         return succeed(studentRegistrationService.getStudentDetail(studentId));
     }
+
+
+    @ApiOperation(value = "根据分部id获取合作单位(学校)列表")
+    @GetMapping("cooperation/getOrganCooperation")
+    public HttpResponseResult<List<CooperationOrgan>> getOrganCooperation(String organId) {
+        return succeed(cooperationOrganService.queryByOrganId(organId));
+    }
 }

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -41,7 +41,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
                         "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
                         "/eduOrganization/queryAllOrgan","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
-                        "/tenantInfo/callback"
+                        "/tenantInfo/callback","/adapay/callback"
                 )
                 .permitAll().anyRequest().authenticated().and().httpBasic();
     }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduOrganizationController.java

@@ -1,15 +1,5 @@
 package com.ym.mec.web.controller.education;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
-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.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
@@ -18,6 +8,14 @@ import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
 
 @RequestMapping("eduOrganization")
 @Api(tags = "分部服务")