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

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherOrderController.java

@@ -1,16 +1,11 @@
 package com.ym.mec.teacher.controller;
 
 import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dao.TenantPaymentOrderDao;
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.TenantPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 import io.swagger.annotations.Api;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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;

mec-application/src/main/java/com/ym/mec/web/controller/HfMerchantConfigController.java

@@ -68,9 +68,9 @@ public class HfMerchantConfigController extends BaseController {
     }
 
     @ApiOperation("根据机构id查询汇付商户配置")
-    @GetMapping(value = "/queryByTenantId")
-    public HttpResponseResult<HfMerchantConfig> queryByTenantId(String payerName, Integer id) {
-        return succeed(hfMerchantConfigService.queryByTenantId(id, payerName));
+    @GetMapping(value = "/queryByTenantId/{id}")
+    public HttpResponseResult<HfMerchantConfig> queryByTenantId(@ApiParam(value = "机构id", required = true) @PathVariable Integer id) {
+        return succeed(hfMerchantConfigService.queryByTenantId(id,null));
     }
 
     @ApiOperation("分页查询汇付商户配置")

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

@@ -92,7 +92,8 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
 
     int updateOrderId(@Param("cloudTeacherOrderId")Integer cloudTeacherOrderId,
                       @Param("amount") BigDecimal amount,
-                      @Param("platformOrderId")Integer platformOrderId);
+                      @Param("platformOrderId")Integer platformOrderId,
+                      @Param("sendSmsFlag")Boolean sendSmsFlag);
 
     int findRecordCount(Map<String, Object> params);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CloudTeacherStudent.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,4 +81,7 @@ public class CloudTeacherStudent {
     private String cancelReason;
 
     private Date createTime;
+
+    @ApiModelProperty(value = "是否发送激活短信")
+    private Boolean sendSmsFlag;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantOrderRecord.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,6 +20,7 @@ import java.util.Date;
  * @author hgw
  * @since 2021-12-20 10:08:28
  */
+@Data
 @ApiModel(value = "tenant_order_record-机构付款记录表")
 public class TenantOrderRecord implements Serializable {
     @TableId(value = "id_", type = IdType.AUTO)
@@ -80,6 +82,10 @@ public class TenantOrderRecord implements Serializable {
     @ApiModelProperty(value = "订单创建时间")
     private Date createdTime;
 
+    @ApiModelProperty(value = "是否发送激活短信")
+    @TableField("send_sms_flag_")
+    private Boolean sendSmsFlag;
+
     public DealStatusEnum getEnumOrderState() {
         switch (orderState) {
             case 0:
@@ -93,118 +99,5 @@ public class TenantOrderRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getTransNo() {
-        return transNo;
-    }
-
-    public void setTransNo(String transNo) {
-        this.transNo = transNo;
-    }
-
-    public String getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
-    public String getPaymentChannel() {
-        return paymentChannel;
-    }
-
-    public void setPaymentChannel(String paymentChannel) {
-        this.paymentChannel = paymentChannel;
-    }
-
-    public String getPayChannel() {
-        return payChannel;
-    }
-
-    public void setPayChannel(String payChannel) {
-        this.payChannel = payChannel;
-    }
-
-    public BigDecimal getExpectAmount() {
-        return expectAmount;
-    }
-
-    public void setExpectAmount(BigDecimal expectAmount) {
-        this.expectAmount = expectAmount;
-    }
-
-    public BigDecimal getActualAmount() {
-        return actualAmount;
-    }
-
-    public void setActualAmount(BigDecimal actualAmount) {
-        this.actualAmount = actualAmount;
-    }
-
-    public String getMerNos() {
-        return merNos;
-    }
-
-    public void setMerNos(String merNos) {
-        this.merNos = merNos;
-    }
-
-    public Integer getOrderState() {
-        return orderState;
-    }
-
-    public void setOrderState(Integer orderState) {
-        this.orderState = orderState;
-    }
-
-    public Date getPayDate() {
-        return payDate;
-    }
-
-    public void setPayDate(Date payDate) {
-        this.payDate = payDate;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TenantOrderRecordVo.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -12,6 +13,7 @@ import java.util.Date;
  * @author hgw
  * Created by 2021-12-21
  */
+@Data
 public class TenantOrderRecordVo implements Serializable {
 
     @ApiModelProperty(value = "机构名称")
@@ -68,107 +70,7 @@ public class TenantOrderRecordVo implements Serializable {
     @ApiModelProperty(value = "订单创建时间")
     private Date createdTime;
 
-    public String getTenantName() {
-        return tenantName;
-    }
-
-    public void setTenantName(String tenantName) {
-        this.tenantName = tenantName;
-    }
-
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getTransNo() {
-        return transNo;
-    }
-
-    public void setTransNo(String transNo) {
-        this.transNo = transNo;
-    }
-
-    public String getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
-    public String getPaymentChannel() {
-        return paymentChannel;
-    }
-
-    public void setPaymentChannel(String paymentChannel) {
-        this.paymentChannel = paymentChannel;
-    }
-
-    public String getPayChannel() {
-        return payChannel;
-    }
-
-    public void setPayChannel(String payChannel) {
-        this.payChannel = payChannel;
-    }
-
-    public BigDecimal getExpectAmount() {
-        return expectAmount;
-    }
-
-    public void setExpectAmount(BigDecimal expectAmount) {
-        this.expectAmount = expectAmount;
-    }
-
-    public BigDecimal getActualAmount() {
-        return actualAmount;
-    }
-
-    public void setActualAmount(BigDecimal actualAmount) {
-        this.actualAmount = actualAmount;
-    }
-
-    public Integer getOrderState() {
-        return orderState;
-    }
-
-    public void setOrderState(Integer orderState) {
-        this.orderState = orderState;
-    }
-
-    public Date getPayDate() {
-        return payDate;
-    }
-
-    public void setPayDate(Date payDate) {
-        this.payDate = payDate;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
+    @ApiModelProperty(value = "是否发送激活短信")
+    @TableField("send_sms_flag_")
+    private Boolean sendSmsFlag;
 }

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

@@ -257,7 +257,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         payMap.put("orderNo", orderNo);
         TenantOrderRecord record = tenantInfoService.createOrderRecord(tenantId, payAmount, orderNo, tenantEnum, orderState, WrapperUtil.toStr(payMap, "routingMerNos"));
         for (CloudTeacherStudent cts : cloudTeacherStudents) {
-            if (cloudTeacherOrderDao.updateOrderId(cts.getCloudTeacherOrderId(), cts.getAmount(), record.getId()) <= 0) {
+            if (cloudTeacherOrderDao.updateOrderId(cts.getCloudTeacherOrderId(), cts.getAmount(), record.getId(),cts.getSendSmsFlag()) <= 0) {
                 throw new Exception("更新订单失败");
             }
         }
@@ -272,11 +272,15 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     @Override
     public int sendSms(TenantOrderRecord record) {
         List<Mapper> orderUsers = cloudTeacherOrderDao.findUserNameByOrderId(record.getId());
-        Map<Integer, String> userPhones = new HashMap<>();
+        if (CollectionUtils.isEmpty(orderUsers)) {
+            return 0;
+        }
         for (Mapper mapper : orderUsers) {
+            Map<Integer, String> userPhones = new HashMap<>(1);
             userPhones.put((Integer) mapper.getKey(), mapper.getValue().toString());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.CLOUD_TEACHER_ORDER_SUCCESS,
+                    userPhones, null, 0, null, null,mapper.getType());
         }
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.CLOUD_TEACHER_ORDER_SUCCESS, userPhones, null, 0, null, null);
         return 0;
     }
 

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

@@ -390,6 +390,13 @@ public class ExportServiceImpl implements ExportService {
         exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_STUDENT_QUIT_DETAIL, this::exportBalancedRelationshipStudentQuitDetail);
         exportManageFuncMap.put(ExportEnum.VIDEO_PLAY_STAT, this::exportVideoPlayStat);
         exportManageFuncMap.put(ExportEnum.VIDEO_PLAY_DETAIL_STAT, this::exportVideoPlayDetailStat);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE, this::exportBalancedRelationshipMusicNoCourse);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM, this::exportBalancedRelationshipMusicNoCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM, this::exportBalancedRelationshipMusicNoClassNoCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_DETAIL, this::exportBalancedRelationshipVipSubCourseDetail);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM, this::exportBalancedRelationshipVipSubCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM, this::exportBalancedRelationshipMusicCourseSum);
+        exportManageFuncMap.put(ExportEnum.EXPORT_BALANCED_RELATIONSHIP_CLOUD_SUM, this::exportBalancedRelationshipCloudSum);
     }
 
     private HttpResponseResult<String> exportVideoPlayStat(Map<String, Object> info) {
@@ -461,10 +468,30 @@ public class ExportServiceImpl implements ExportService {
         SysUser sysUser = sysUserService.getUser();
         String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipMusicCourse(month,organIds),
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipMusicCourse1(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE),
                 managerDownload.getName());
     }
+
+    private HttpResponseResult<String> exportBalancedRelationshipMusicCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicCourseSum(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipCloudSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_CLOUD_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipCloudSum(month),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_CLOUD_SUM),
+                managerDownload.getName());
+    }
+
     private HttpResponseResult<String> exportBalancedRelationshipVipCourse(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
@@ -510,6 +537,7 @@ public class ExportServiceImpl implements ExportService {
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_STUDENT_NORMAL_DETAIL),
                 managerDownload.getName());
     }
+
     private HttpResponseResult<String> exportBalancedRelationshipStudentQuitDetail(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
@@ -520,6 +548,54 @@ public class ExportServiceImpl implements ExportService {
                 managerDownload.getName());
     }
 
+    private HttpResponseResult<String> exportBalancedRelationshipMusicNoCourse(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourse(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipMusicNoCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourseSum(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipMusicNoClassNoCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoClassNoCourseSum(month),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseDetail(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_DETAIL,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseDetail(month,organIds),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_DETAIL),
+                managerDownload.getName());
+    }
+
+    private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseSum(Map<String, Object> info){
+        String month = getParam(info, "month", String.class);
+        SysUser sysUser = sysUserService.getUser();
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM,sysUser.getId());
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseSum(month),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM),
+                managerDownload.getName());
+    }
+
     private HttpResponseResult<String> exportOperatingSummaryIncome(Map<String, Object> info) {
         String month = getParam(info, "month", String.class);
         Map<String, Object> params = new HashMap<>(1);

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

@@ -34,7 +34,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.entity.BaseResult;
-import com.ym.mec.thirdparty.yqpay.*;
+import com.ym.mec.thirdparty.yqpay.DateUtils;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -65,8 +65,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Autowired
     private StudentPaymentOrderDao studentPaymentOrderDao;
-    @Autowired
-    private YqPayFeignService yqPayFeignService;
+//    @Autowired
+//    private YqPayFeignService yqPayFeignService;
     @Autowired
     private StudentRegistrationService studentRegistrationService;
     @Autowired
@@ -270,7 +270,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         //reConfirmOrder(null, null);
     }
 
-    private void yqPayQuery(List<StudentPaymentOrder> payingOrders) throws Exception {
+    /*private void yqPayQuery(List<StudentPaymentOrder> payingOrders) throws Exception {
         if (payingOrders == null) {
             payingOrders = findOrdersByStatus(DealStatusEnum.ING);
         }
@@ -314,7 +314,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             }
             closeOrders(orderNoList); //关闭订单
         }
-    }
+    }*/
 
     private void adaPayQuery(List<StudentPaymentOrder> payingOrders) throws Exception {
         if (payingOrders == null) {
@@ -827,7 +827,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentPaymentOrder.getPaymentChannel().equals(PaymentChannelEnum.ADAPAY.getCode()) || studentPaymentOrder.getPaymentChannel().equals(PaymentChannelEnum.YEEPAY.getCode())) {
             adaPayQuery(orderList);
         } else if (studentPaymentOrder.getPaymentChannel().equals("YQPAY")) {
-            yqPayQuery(orderList);
+//            yqPayQuery(orderList);
+            throw new BizException("暂不支持易签宝支付");
         }
         return true;
     }

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

@@ -134,11 +134,13 @@
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="mapper">
         <result column="userId" property="key"/>
         <result column="phone" property="value"/>
+        <result column="type" property="type"/>
     </resultMap>
     <select id="findUserNameByOrderId" resultMap="mapper">
-        select su.id_ as userId, su.phone_ as phone from cloud_teacher_order cto
+        select su.id_ as userId, su.phone_ as phone,mrs.name_ type from cloud_teacher_order cto
+        left join member_rank_setting mrs ON mrs.id_ = cto.level_
         left join sys_user su on cto.student_id_ = su.id_
-        where platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0'
+        where platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0' and cto.send_sms_flag_ = 1
     </select>
 
     <update id="updateOrderStatusOK">
@@ -156,6 +158,9 @@
     <update id="updateOrderId">
         update cloud_teacher_order
         set platform_order_id_ = #{platformOrderId} , pay_amount_ = #{amount}
+        <if test="sendSmsFlag != null">
+            ,send_sms_flag_ = #{sendSmsFlag}
+        </if>
         where id_ = #{cloudTeacherOrderId}
     </update>
 

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

@@ -134,7 +134,13 @@
 	</select>
 	
 	<select id="queryByTenantId" resultMap="HfMerchantConfig">
-		SELECT * FROM hf_merchant_config where tenant_id_ = #{tenantId} AND payer_name_ = #{payerName}
+		SELECT * FROM hf_merchant_config where tenant_id_ = #{tenantId}
+		<if test="payerName != null and payerName != ''">
+			AND payer_name_ = #{payerName}
+		</if>
+		<if test="payerName == null or payerName == ''">
+			AND payer_name_ = 'ADAPAY'
+		</if>
 	</select>
 
     <sql id="queryPageSql">

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

@@ -16,11 +16,13 @@
         <result column="pay_date_" jdbcType="TIMESTAMP" property="payDate"/>
         <result column="pay_time_" jdbcType="TIMESTAMP" property="payTime"/>
         <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
+        <result column="send_sms_flag_" property="sendSmsFlag"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         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_
+        , 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_,send_sms_flag_
     </sql>
     
     <select id="getLockedById" resultMap="BaseResultMap">
@@ -30,12 +32,12 @@
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.ym.mec.biz.dal.entity.TenantOrderRecord">
         insert into tenant_order_record(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_)
+        expect_amount, actual_amount, mer_nos_,order_state_, pay_date_, pay_time_, created_time_,send_sms_flag_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.tenantId}, #{entity.orderNo}, #{entity.transNo}, #{entity.orderType}, #{entity.paymentChannel},
             #{entity.payChannel}, #{entity.expectAmount}, #{entity.actualAmount}, #{entity.merNos},#{entity.orderState},
-            #{entity.payDate}, #{entity.payTime}, #{entity.createdTime})
+            #{entity.payDate}, #{entity.payTime}, #{entity.createdTime},#{entity.sendSmsFlag})
         </foreach>
     </insert>
 
@@ -54,7 +56,8 @@
             a.order_state_ as orderState,
             a.pay_date_ as payDate,
             a.pay_time_ as payTime,
-            a.created_time_ as createdTime
+            a.created_time_ as createdTime,
+            a.send_sms_flag_ as sendSmsFlag
         FROM
             tenant_order_record AS a
                 LEFT JOIN tenant_info AS b

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/YqPayFeignService.java

@@ -1,26 +1,9 @@
 package com.ym.mec.thirdparty.yqpay;
 
-import feign.Logger;
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-@FeignClient(value = "YqPayFeignService",url = "https://qyfquery.95epay.com",configuration = YqPayFeignService.FormSupportConfig.class)
+//@FeignClient(value = "YqPayFeignService",url = "https://qyfquery.95epay.com",configuration = YqPayFeignService.FormSupportConfig.class)
 public interface YqPayFeignService {
 
-    @PostMapping(name = "订单查询", value = "/query/trade/tradeQuery",
+   /* @PostMapping(name = "订单查询", value = "/query/trade/tradeQuery",
             consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE},
             produces = {MediaType.APPLICATION_JSON_UTF8_VALUE}
     )
@@ -49,5 +32,5 @@ public interface YqPayFeignService {
             return Logger.Level.FULL;
         }
     }
-
+*/
     }