Merge branch 'online1'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -44,6 +44,10 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "教师角色")
     private TeachTypeEnum teacherRole;
 
+    @ApiModelProperty(value = "投诉状态")
+    private Integer complaintStatus;
+
+
     private String subjectName;
 
     private String subjectId;
@@ -160,6 +164,14 @@ public class CourseScheduleDto extends CourseSchedule {
         this.groupName = groupName;
     }
 
+    public Integer getComplaintStatus() {
+        return complaintStatus;
+    }
+
+    public void setComplaintStatus(Integer complaintStatus) {
+        this.complaintStatus = complaintStatus;
+    }
+
     public Integer getExpectStudentNum() {
         return expectStudentNum;
     }

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

@@ -5,15 +5,13 @@ import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.entity.SysAccount;
 import com.ym.mec.biz.dal.entity.SysPaymentConfig;
 import com.ym.mec.biz.dal.enums.PaymentChannelTypeEnum;
-import com.ym.mec.biz.service.PayService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.SysAccountService;
-import com.ym.mec.biz.service.SysPaymentConfigService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.union.UnionPay;
 import com.ym.mec.thirdparty.union.UnionPayFeignService;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -85,6 +83,14 @@ public class PayServiceImpl implements PayService {
     @Override
     public Map<String, Object> getPayMap(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, Integer userId, Map<String, BigDecimal> fee, Integer organId) throws Exception {
         String company = "daya";
+        //直接收到深圳的分部
+        String sDaYaOrganIds = sysConfigDao.findConfigValue(SysConfigService.SZ_DA_YA_ORGAN_IDS);
+        if (StringUtils.isNotBlank(sDaYaOrganIds)) {
+            List<String> sDaYaOrganIdList = Arrays.asList(sDaYaOrganIds.split(","));
+            if (sDaYaOrganIdList.contains(organId.toString())) {
+                company = "sdaya";
+            }
+        }
         //支付通道决策
         Map<String, Object> unionPay = new HashMap<>();
         Map<String, BigDecimal> routingFee = getRoutingFee(company, amount, fee, organId);
@@ -148,6 +154,15 @@ public class PayServiceImpl implements PayService {
             receiver = null;
         }
 
+        //直接收到深圳的分部
+        String sDaYaOrganIds = sysConfigDao.findConfigValue(SysConfigService.SZ_DA_YA_ORGAN_IDS);
+        if (StringUtils.isNotBlank(sDaYaOrganIds)) {
+            List<String> sDaYaOrganIdList = Arrays.asList(sDaYaOrganIds.split(","));
+            if (sDaYaOrganIdList.contains(organId.toString())) {
+                company = "sdaya";
+            }
+        }
+
         //支付通道决策
         Map<String, Object> unionPay = new HashMap<>();
         Map<String, BigDecimal> routingFee = getRoutingFee(company, amount, fee, organId, receiver);

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

@@ -70,7 +70,7 @@
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="attendance_status_" property="attendanceStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="complaint_status_" property="complaintsStatus"/>
+        <result column="complaint_status_" property="complaintStatus"/>
         <result column="student_id_" property="studentId"/>
     </resultMap>