修改代码

pz-accompany/src/main/java/com/pz/accompany/AccompanyEmployeesController.java

@@ -3,6 +3,7 @@ package com.pz.accompany;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.R;
+import com.pz.common.core.domain.entity.SysUser;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.validate.EditGroup;
 import com.pz.merchant.domain.bo.EmployeesBo;
@@ -14,11 +15,13 @@ import com.pz.merchant.domain.vo.EmployeesVo;
 import com.pz.merchant.domain.vo.OrderInfoVO;
 import com.pz.merchant.domain.vo.TodayOrderListVo;
 import com.pz.merchant.service.IEmployeesService;
+import com.pz.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.util.Optional;
 
 /**
  * 陪诊员信息
@@ -34,6 +37,8 @@ public class AccompanyEmployeesController extends BaseController {
 
     private final IEmployeesService employeesService;
 
+    private final ISysUserService iSysUserService;
+
     /**
      * 修改陪诊员个人信息
      *
@@ -41,8 +46,13 @@ public class AccompanyEmployeesController extends BaseController {
      * @return
      */
     @PutMapping("/updateEmployees")
-    public R<Boolean> updateEmployees(EmployeesBo bo) {
-        return R.ok(employeesService.updateByBo(bo));
+    public R<Boolean> updateEmployees(@RequestBody EmployeesBo bo) {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(getUserId());
+        sysUser.setAvatar(bo.getAvatar());
+        sysUser.setNickName(bo.getName());
+        employeesService.updateByBo(bo);
+        return R.ok(iSysUserService.updateUserAvatarByUserId(sysUser) > 0);
     }
 
     /**
@@ -50,6 +60,11 @@ public class AccompanyEmployeesController extends BaseController {
      */
     @GetMapping("/getEmployeesInfo")
     public R<EmployeesVo> getEmployeesInfo() {
-        return R.ok(employeesService.queryByUserId(getUserId()));
+        EmployeesVo employeesVo = employeesService.queryByUserId(getUserId());
+        Optional.ofNullable(iSysUserService.selectUserById(getUserId()))
+            .ifPresent(sysUser -> {
+                employeesVo.setAvatar(sysUser.getAvatar());
+            });
+        return R.ok(employeesVo);
     }
 }

pz-accompany/src/main/java/com/pz/accompany/AccompanyEmployeesIncomeController.java

@@ -11,6 +11,7 @@ import com.pz.merchant.service.IEmployeesService;
 import com.pz.system.domain.bo.IncomeBo;
 import com.pz.system.domain.vo.IncomeVo;
 import com.pz.system.service.IIncomeService;
+import com.pz.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +39,8 @@ public class AccompanyEmployeesIncomeController extends BaseController {
 
     private final IIncomeService iIncomeService;
 
+    private final ISysUserService iSysUserService;
+
     /**
      * 获取总收益与余额
      */
@@ -66,8 +69,14 @@ public class AccompanyEmployeesIncomeController extends BaseController {
      */
     @PutMapping("/withdrawEmployees")
     public R<Boolean> withdrawEmployees(IncomeBo bo) {
+        //获取openid
+        Optional.ofNullable(iSysUserService.selectUserById(getUserId()))
+            .ifPresent(sysUser -> {
+                bo.setOpenid(sysUser.getOpenId());
+            });
         Optional.ofNullable(iEmployeesService.queryByUserId(getUserId()))
             .ifPresent(employeesVo -> {
+                bo.setEcId(employeesVo.getId());
                 //判断提现金额是否大于余额
                 if (bo.getAmount().compareTo(StringUtils.isNotBlank(employeesVo.getBalance()) ? new BigDecimal(employeesVo.getBalance()) : new BigDecimal("0.00")) > 0) {
                     try {
@@ -77,6 +86,6 @@ public class AccompanyEmployeesIncomeController extends BaseController {
                     }
                 }
             });
-        return R.ok(true);
+        return R.ok(iIncomeService.withdrawEmployees(bo));
     }
 }

pz-system/src/main/java/com/pz/merchant/domain/bo/EmployeesBo.java

@@ -29,6 +29,11 @@ public class EmployeesBo extends BaseEntity {
      */
     private String name;
 
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
     /**
      * 职业开始年份
      */

pz-system/src/main/java/com/pz/merchant/domain/vo/EmployeesVo.java

@@ -132,4 +132,6 @@ public class EmployeesVo {
     private Integer wrokYear;
 
     private String phone;
+
+    private String workingHours;
 }

pz-system/src/main/java/com/pz/merchant/service/IEmployeesService.java

@@ -124,4 +124,5 @@ public interface IEmployeesService {
      * @return
      */
     EmployeesVo queryByUserId(Long userId);
+
 }

pz-system/src/main/java/com/pz/system/service/IIncomeService.java

@@ -52,4 +52,12 @@ public interface IIncomeService {
      * @return
      */
     TableDataInfo<IncomeVo> queryByEidList(IncomeBo bo,PageQuery pageQuery);
+
+    /**
+     * 陪诊员提现
+     * @param incomeBo
+     * @return
+     */
+    Boolean withdrawEmployees(IncomeBo incomeBo);
+
 }

pz-system/src/main/java/com/pz/system/service/ISysUserService.java

@@ -143,6 +143,15 @@ public interface ISysUserService {
      */
     int updateUser(SysUser user);
 
+
+    /**
+     * 根据用户编号修改用户头像
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    int updateUserAvatarByUserId(SysUser user);
+
     /**
      * 用户授权角色
      *

pz-system/src/main/java/com/pz/system/service/impl/IncomeServiceImpl.java

@@ -7,6 +7,7 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.merchant.domain.Employees;
 import com.pz.merchant.mapper.CompanyMapper;
 import com.pz.merchant.mapper.EmployeesMapper;
 import lombok.RequiredArgsConstructor;
@@ -16,7 +17,9 @@ import com.pz.system.domain.vo.IncomeVo;
 import com.pz.system.domain.Income;
 import com.pz.system.mapper.IncomeMapper;
 import com.pz.system.service.IIncomeService;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -144,4 +147,20 @@ public class IncomeServiceImpl implements IIncomeService {
         Page<IncomeVo> result = baseMapper.selectVoPage(pageQuery.build(), Wrappers.<Income>lambdaQuery().eq(Income::getEcId, bo.getEcId()).eq(Income::getUserType, 1).eq(Income::getStatus, bo.getStatus()));
         return TableDataInfo.build(result);
     }
+
+    @Override
+    @Transactional
+    public Boolean withdrawEmployees(IncomeBo incomeBo) {
+        //新增提现记录
+        incomeBo.setUserType(1);
+        Income add = BeanUtil.toBean(incomeBo, Income.class);
+        baseMapper.insert(add);
+
+        //修改陪诊员余额
+        Employees employees = new Employees();
+        employees.setId(incomeBo.getEcId());
+        BigDecimal subtract = new BigDecimal(employees.getBalance()).subtract(incomeBo.getAmount());
+        employees.setBalance(subtract.toString());
+        return employeesMapper.updateById(employees) > 0;
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java

@@ -322,6 +322,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.updateById(user);
     }
 
+    @Override
+    public int updateUserAvatarByUserId(SysUser user) {
+        return baseMapper.updateById(user);
+    }
+
     /**
      * 用户授权角色
      *