update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -33,4 +33,7 @@ public interface SysUserFeignService {
 
 	@GetMapping(value = "role/queryRoleCodeListByUserId")
 	public List<String> queryRoleCodeListByUserId(@RequestParam("userId") Integer userId);
+	
+	@PostMapping(value = "user/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+	public Boolean updateSysUser(SysUser user);
 }

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -40,4 +40,10 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return null;
 	}
 
+	@Override
+	public Boolean updateSysUser(SysUser user) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -42,14 +42,14 @@ public class UserController extends BaseController {
 			@ApiImplicitParam(name = "createStartDate", value = "开始注册时间", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "createEndDate", value = "结束注册时间", required = true, dataType = "String") })
 	@GetMapping(value = "/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('user/queryPage')")
+	@PreAuthorize("@pcs.hasPermissions('user/queryPage')")
 	public Object queryPage(SysUserQueryInfo queryInfo) {
 		return succeed(sysUserService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "查询用户信息接口")
 	@GetMapping("/query")
-    @PreAuthorize("@pcs.hasPermissions('user/query')")
+	@PreAuthorize("@pcs.hasPermissions('user/query')")
 	public Object query() {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
@@ -77,8 +77,15 @@ public class UserController extends BaseController {
 		return sysUserService.get(userId);
 	}
 
+	@PostMapping(value = "/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+	public boolean updateSysUser(@RequestBody SysUser user) {
+		user.setUpdateTime(new Date());
+		sysUserService.update(user);
+		return true;
+	}
+
 	@ApiOperation(value = "新增用户")
-    @PreAuthorize("@pcs.hasPermissions('user/add')")
+	@PreAuthorize("@pcs.hasPermissions('user/add')")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object add(@RequestBody SysUser sysUser) {
 		return succeed(sysUserService.add(sysUser));
@@ -143,7 +150,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "获取用户角色列表")
 	@GetMapping("/getRole")
-    @PreAuthorize("@pcs.hasPermissions('user/getRole')")
+	@PreAuthorize("@pcs.hasPermissions('user/getRole')")
 	public Object getRole() {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
@@ -156,7 +163,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/addRole", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    @PreAuthorize("@pcs.hasPermissions('user/addRole')")
+	@PreAuthorize("@pcs.hasPermissions('user/addRole')")
 	public Object getRole(String userId, String roleIds) {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
@@ -169,7 +176,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/delRole", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    @PreAuthorize("@pcs.hasPermissions('user/delRole')")
+	@PreAuthorize("@pcs.hasPermissions('user/delRole')")
 	public Object delRole(String userId, String roleIds) {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);

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

@@ -1,71 +1,33 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-
-/**
- * @program: mec
- * @description: 提现
- * @author: xw
- * @create: 2019-09-23 17:12
- */
-public class WithdrawDto extends QueryInfo {
-
-    @ApiModelProperty(value = "用户id",required = false)
-    private Integer userId;
-
-    @ApiModelProperty(value = "银行卡号", required = true)
-    private String bankCardNo;
 
-    @ApiModelProperty(value = "提现金额", required = true)
-    private BigDecimal amount;
-
-    @ApiModelProperty(value = "交易类型", required = true)
-    private Integer TransType;
-
-    public WithdrawDto() {
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
+import com.ym.mec.common.page.QueryInfo;
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
+public class WithdrawDto extends QueryInfo {
 
-    public String getBankCardNo() {
-        return bankCardNo;
-    }
+	@ApiModelProperty(value = "用户id", required = false)
+	private Integer userId;
 
-    public void setBankCardNo(String bankCardNo) {
-        this.bankCardNo = bankCardNo;
-    }
+	@ApiModelProperty(value = "银行卡号", required = true)
+	private String bankCardNo;
 
-    public BigDecimal getAmount() {
-        return amount;
-    }
+	public WithdrawDto() {
+	}
 
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
+	public Integer getUserId() {
+		return userId;
+	}
 
-    public Integer getTransType() {
-        return TransType;
-    }
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
 
-    public void setTransType(Integer transType) {
-        TransType = transType;
-    }
+	public String getBankCardNo() {
+		return bankCardNo;
+	}
 
-    @Override
-    public String toString() {
-        return "WithdrawDto{" +
-                "userId=" + userId +
-                ", bankCardNo='" + bankCardNo + '\'' +
-                ", amount=" + amount +
-                ", TransType=" + TransType +
-                '}';
-    }
+	public void setBankCardNo(String bankCardNo) {
+		this.bankCardNo = bankCardNo;
+	}
 }

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

@@ -19,9 +19,10 @@ public interface StudentWithdrawService extends BaseService<Integer, StudentWith
 	 * @param memo 备注
 	 * @param transNo 交易流水号
 	 * @param transType 交易渠道
+	 * @param platformAccountNo 平台账户号
 	 * @return
 	 */
-	boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType);
+	boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType, String platformAccountNo);
 
 	/**
 	 * 根据学员id查询提现记录

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

@@ -1,13 +1,10 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto;
+import java.util.List;
+
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.util.List;
-
 public interface SysUserBankCardService extends BaseService<Long, SysUserBankCard> {
 
     /**

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

@@ -9,6 +9,7 @@ import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.service.SysMessageService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -64,7 +65,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType) {
+	public boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType, String platformAccountNo) {
 
 		StudentWithdraw studentWithdraw = get(id);
 
@@ -94,13 +95,13 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 				throw new BizException("账户冻结金额异常");
 			}
 			sysUserCashAccount.setFrozenAmount(sysUserCashAccount.getFrozenAmount().subtract(amount));
-			
-			if(status == DealStatusEnum.FAilED){
+
+			if (status == DealStatusEnum.FAilED) {
 				sysUserCashAccount.setBalance(sysUserCashAccount.getBalance().add(amount));
 			}
 			sysUserCashAccount.setUpdateTime(date);
 			cashAccountService.update(sysUserCashAccount);
-			
+
 			SysUserCashAccountDetail sysUserCashAccountDetail = new SysUserCashAccountDetail();
 			sysUserCashAccountDetail.setUserId(userId);
 			sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.WITHDRAW);
@@ -111,7 +112,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 			sysUserCashAccountDetail.setTransNo(transNo);
 			sysUserCashAccountDetail.setTransType(transType);
 			sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
-			
+
 			cashAccountDetailService.insert(sysUserCashAccountDetail);
 
 		} catch (Exception e) {
@@ -186,10 +187,12 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 				cashAccountDetail.setBalance(subtract);
 				cashAccountDetail.setCreateTime(date);
 				cashAccountDetail.setStatus(DealStatusEnum.ING);
+				cashAccountDetail.setAttribute(withdraw.getId()+"");
 				cashAccountDetailService.insert(cashAccountDetail);
 				Set<Integer> roleIds = new HashSet<>(1);
 				roleIds.add(SysUserRole.SECTION_MANAGER);
-				sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds), MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_WITHDRAW,sysUser.getUsername());
+				sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds), MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_WITHDRAW,
+						sysUser.getUsername());
 			} else {
 				throw new Exception("账户余额不足");
 			}

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

@@ -1,25 +1,30 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.SysUserBankCardDao;
-import com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto;
-import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
-import com.ym.mec.biz.service.SysUserBankCardService;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.SysUserBankCardDao;
+import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.service.SysUserBankCardService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 @Service
 public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBankCard> implements SysUserBankCardService {
 	
 	@Autowired
 	private SysUserBankCardDao sysUserBankCardDao;
+	
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+	
 	@Autowired
 	private RedisTemplate<String,String> redisTemplate;
 	private final String loginVerifyCodeKey = "loginVerifyCode:";
@@ -45,6 +50,17 @@ public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBan
             sysUserBankCardDao.setNotDefault(sysUserBankCard.getUserId());
         }
 		sysUserBankCardDao.insert(sysUserBankCard);
+		
+		//更新user表信息
+		Integer userId = sysUserBankCard.getUserId();
+		SysUser user = sysUserFeignService.queryUserById(userId);
+		if(user == null){
+			throw new BizException("用户信息查询失败");
+		}
+		user.setRealName(sysUserBankCard.getRealName());
+		user.setIdCardNo(sysUserBankCard.getIdCardNo());
+		sysUserFeignService.updateSysUser(user);
+		
 		return sysUserBankCard;
 	}
 

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

@@ -25,7 +25,7 @@
         <result column="balance_" property="balance"/>
         <result column="real_name_" property="realName"/>
     </resultMap>
-
+    
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="StudentWithdraw">
 		SELECT * FROM student_withdraw WHERE id_ = #{id}
@@ -92,14 +92,17 @@
 	</delete>
 
     <!-- 分页查询 -->
-    <select id="queryPage" resultMap="StudentWithdraw" parameterType="map">
+    <select id="queryPage" resultMap="UserStudentWithdraw" parameterType="map">
         SELECT sw.*,cad.platform_account_no_,cad.channel_,su.real_name_,cad.balance_
         FROM student_withdraw sw
         LEFT JOIN sys_user_cash_account_detail cad ON sw.id_ = cad.attribute1_
         LEFT JOIN sys_user su ON sw.id_ = cad.attribute1_
         <where>
             <if test="userId != null">
-                sw.user_id_ = #{userId}
+                and sw.user_id_ = #{userId}
+            </if>
+            <if test="bankCardNo != null">
+                and sw.bank_card_no_ = #{bankCardNo}
             </if>
         </where>
         ORDER BY sw.create_time_ DESC
@@ -111,7 +114,10 @@
 		SELECT COUNT(*) FROM student_withdraw
         <where>
             <if test="userId != null">
-                user_id_ = #{userId}
+                and user_id_ = #{userId}
+            </if>
+            <if test="bankCardNo != null">
+                and bank_card_no_ = #{bankCardNo}
             </if>
         </where>
 	</select>

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

@@ -27,8 +27,8 @@ public class StudentWithdrawController extends BaseController {
 	@PostMapping("confirm")
 	@ApiOperation(value = "确认提现")
 	@PreAuthorize("@pcs.hasPermissions('studentWithdraw/confirm')")
-	public Object confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType) {
-		studentWithdrawService.confirmWithdraw(id, status, memo, transNo, transType);
+	public Object confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType, String platformAccountNo) {
+		studentWithdrawService.confirmWithdraw(id, status, memo, transNo, transType, platformAccountNo);
 		return succeed();
 	}