update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -153,6 +153,8 @@ public class SysUser extends BaseEntity implements Serializable{
 
 	@ApiModelProperty(value = "开户行",required = false)
 	private String openBankAddress;
+	
+	private String positionName;
 
 	public String getCertificateType() {
 		return certificateType;
@@ -488,4 +490,12 @@ public class SysUser extends BaseEntity implements Serializable{
 	public void setDeptId(Integer deptId) {
 		this.deptId = deptId;
 	}
+
+	public String getPositionName() {
+		return positionName;
+	}
+
+	public void setPositionName(String positionName) {
+		this.positionName = positionName;
+	}
 }

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

@@ -1,14 +1,16 @@
 package com.ym.mec.biz.dal.dao;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.dto.SysEmployeePositionDto;
 import com.ym.mec.biz.dal.entity.SysEmployeePosition;
 import com.ym.mec.biz.dal.enums.SysUserRoleEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 public interface SysEmployeePositionDao extends BaseDAO<Integer, SysEmployeePosition> {
 
@@ -44,4 +46,6 @@ public interface SysEmployeePositionDao extends BaseDAO<Integer, SysEmployeePosi
     * @date 2022/1/8 16:28
     */
     Set<Integer> queryUserIdByRoleId(@Param("roleArr") SysUserRoleEnum[] roleArr, @Param("organId") Integer organId, @Param("tenantId") Integer tenantId);
+    
+    List<SysEmployeePositionDto> queryByUserId(Integer userId);
 }

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

@@ -0,0 +1,26 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.SysEmployeePosition;
+
+public class SysEmployeePositionDto extends SysEmployeePosition {
+
+	private String positionName;
+	
+	private String positionCode;
+
+	public String getPositionName() {
+		return positionName;
+	}
+
+	public void setPositionName(String positionName) {
+		this.positionName = positionName;
+	}
+
+	public String getPositionCode() {
+		return positionCode;
+	}
+
+	public void setPositionCode(String positionCode) {
+		this.positionCode = positionCode;
+	}
+}

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.dto.SysEmployeePositionDto;
 import com.ym.mec.biz.dal.entity.SysEmployeePosition;
 import com.ym.mec.biz.dal.enums.SysUserRoleEnum;
 import com.ym.mec.common.service.BaseService;
@@ -52,4 +53,6 @@ public interface SysEmployeePositionService extends BaseService<Integer, SysEmpl
      * @date 2022/1/4 11:36
      */
     Set<Integer> queryUserIdByRoleId(SysUserRoleEnum[] roleArr, Integer organId);
+
+    List<SysEmployeePositionDto> queryByUserId(Integer userId);
 }

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

@@ -13,6 +13,8 @@ import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
+import com.ym.mec.util.json.JsonUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
@@ -242,7 +244,23 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         paymentParams.put("pay_amt", payParam.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
         paymentParams.put("goods_title", payParam.getOrderSubject());
         paymentParams.put("goods_desc", payParam.getOrderBody());
-        paymentParams.put("pay_mode", "delay");
+
+        //延时分账
+        //paymentParams.put("pay_mode", "delay");
+        
+        //实时分账
+        List<Map<String,Object>> divMemberList = new ArrayList<Map<String,Object>>();
+        Map<String,Object> divMember = new HashMap<String, Object>();
+        //divMember.put("member_id", value);
+        //divMember.put("amount", value);
+        divMember.put("fee_flag", "N");
+        
+        divMemberList.add(divMember);
+        
+        paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));
+        
+        //手续费收取模式：O-商户手续费账户扣取手续费，I-交易金额中扣取手续费；值为空时，默认值为I；若为O时，分账对象列表中不支持传入手续费承担方
+        paymentParams.put("fee_mode", "O");
         return paymentParams;
     }
 

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

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dao.SysEmployeePositionDao;
 import com.ym.mec.biz.dal.dao.SysPositionDao;
 import com.ym.mec.biz.dal.dao.TenantInfoDao;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.dto.SysEmployeePositionDto;
 import com.ym.mec.biz.dal.entity.SysEmployeePosition;
 import com.ym.mec.biz.dal.entity.TenantInfo;
 import com.ym.mec.biz.dal.enums.SysUserRoleEnum;
@@ -12,6 +13,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,4 +107,9 @@ public class SysEmployeePositionServiceImpl extends BaseServiceImpl<Integer, Sys
 		Integer tenantId = TenantContextHolder.getTenantId();
 		return sysEmployeePositionDao.queryUserIdByRoleId(roleArr,organId,tenantId);
     }
+
+	@Override
+	public List<SysEmployeePositionDto> queryByUserId(Integer userId) {
+		return sysEmployeePositionDao.queryByUserId(userId);
+	}
 }

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

@@ -1110,7 +1110,7 @@
         CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
         cs.actual_teacher_id_ teacher_id_,
         cs.teach_mode_,
-        s.name_ school_name
+        s.name_ school_name_
         FROM course_schedule_student_payment cssp
         LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ =
         sa.user_id_
@@ -1143,7 +1143,7 @@
                CONCAT(cs.class_date_, ' ', cs.end_class_time_)   end_class_time_,
                cs.teach_mode_,
                cs.class_group_id_,
-        		s.name_ school_name
+        		s.name_ school_name_
         FROM class_group_student_mapper cgsm
                  LEFT JOIN course_schedule cs ON cs.class_group_id_ = cgsm.class_group_id_
         		left join school s on s.id_ = cs.schoole_id_

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

@@ -11,6 +11,11 @@
 		<result column="role_id_" property="roleId" />
 		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
+		
+	<resultMap type="com.ym.mec.biz.dal.dto.SysEmployeePositionDto" id="SysEmployeePositionDto">
+		<result column="position_name_" property="positionName" />
+		<result column="position_code_" property="positionCode" />
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysEmployeePosition" parameterType="java.util.Map">
@@ -109,4 +114,10 @@
 			#{role}
 		</foreach>
 	</select>
+	
+	<select id="queryByUserId" resultMap="SysEmployeePositionDto">
+		SELECT sep.*,sp.role_name_ position_name_,sp.role_code_ position_code_ FROM sys_employee_position sep
+		LEFT JOIN sys_position sp ON sp.id_ = sep.role_id_
+		WHERE sep.user_id_ = #{userId}
+	</select>
 </mapper>

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

@@ -1,31 +1,34 @@
 package com.ym.mec.web.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+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.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.EmployeeLevelDto;
-import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.dto.SysEmployeePositionDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
-import com.ym.mec.biz.dal.enums.EmployeeRoleEnum;
 import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
 import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.StudentManageService;
+import com.ym.mec.biz.service.SysEmployeePositionService;
 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.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @Author Joburgess
@@ -46,6 +49,8 @@ public class EmployeeController extends BaseController {
     private OrganizationService organizationService;
     @Autowired
     private EmployeeDao employeeDao;
+    @Autowired
+    private SysEmployeePositionService sysEmployeePositionService;
 
     @ApiOperation(value = "根据部门获取下面的员工")
     @GetMapping("/queryEmployByOrganId")
@@ -145,6 +150,11 @@ public class EmployeeController extends BaseController {
             sysUser.setBankCard(employee.getBankCard());
             sysUser.setOpenBankAddress(employee.getOpenBankAddress());
             sysUser.setPostDeptIds(employee.getPostDeptIds());
+            
+            List<SysEmployeePositionDto> sysEmployeePositionDtoList = sysEmployeePositionService.queryByUserId(sysUser.getId());
+            if(sysEmployeePositionDtoList != null && sysEmployeePositionDtoList.size() > 0){
+            	sysUser.setPositionName(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getPositionName).collect(Collectors.joining(",")));
+            }
             return succeed(sysUser);
         }
         return failed("获取用户信息失败");