Merge remote-tracking branch 'origin/master'

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -347,19 +347,13 @@ public class SysUserController extends BaseController {
         return HttpResult.ok(sysUserService.gainUserPage(pageDto));
     }
 
-    @ApiOperation(value = "分为渠道和个代的用户查询分页")
+    @ApiOperation(value = "分为后线、渠道和个代的用户查询分页")
     @PostMapping(value = "/findUserList")
     public HttpResult findUserList(@RequestBody PageDto<SysUserDto> pageDto) {
-        //获取用户角色
-        BaseController baseController = new BaseController();
-//        if (RoleConstants.R22.getCode().equals(pageDto.getDto().getRoleId())) {
-//            pageDto.getDto().setRoleId("17,18,22,23,24,25,28,29,30,31,32,38");
-//        }
-        //设置登录用户的部门
-//        if ("".equals(pageDto.getDto().getDeptId()) || null == pageDto.getDto().getDeptId()) {
-//            pageDto.getDto().setDeptId(baseController.getDeptId());
-//        }
-
+        if (pageDto.getDto().getDeptId() == null){
+            BaseController baseController = new BaseController();
+            pageDto.getDto().setDeptId(baseController.getDeptId());
+        }
         return HttpResult.ok(sysUserService.findUserList(pageDto));
     }
 
@@ -460,6 +454,7 @@ public class SysUserController extends BaseController {
         if (StringUtils.isNotEmpty(sysUser.getDeptId())) {
             SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
             sysUser.setDeptName(sysDept.getName());
+            sysUser.setIsHasAddUser(sysDept.getManagementSource()!=null?1:0);
         }
 
         EsmUserReferrer eur = esmUserReferrerService.getById(sysUser.getId());

src/main/java/com/ydtech/modules/admin/controller/SysUserRecruitingController.java

@@ -23,9 +23,8 @@ public class SysUserRecruitingController {
     @GetMapping("/queryType")
     @ApiOperation("机构来源查询")
     public HttpResult<Object> queryType(){
-        SysUser user = new BaseController().getUser();
-        String deptId = user.getDeptId();
-        return sysUserRecruitingService.queryType(deptId);
+        BaseController baseController = new BaseController();
+        return sysUserRecruitingService.queryType(baseController.getDeptId());
     }
 
 }

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -10,6 +10,7 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.model.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -108,6 +109,11 @@ public class SysUser extends BaseEntity {
 
     //------------------
 
+
+    @ApiModelProperty(value = "是否有闪电增员权限")
+    @TableField(exist = false)
+    private Integer isHasAddUser;
+
     /**
      * 角色ID
      */

src/main/java/com/ydtech/modules/admin/model/SysUserInfo.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -66,6 +67,7 @@ public class SysUserInfo implements Serializable {
 
     @ApiModelProperty(value = "出生日期")
     @TableField(value = "birthday")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate birthday;
 
     @ApiModelProperty(value = "婚姻状况")
@@ -99,6 +101,7 @@ public class SysUserInfo implements Serializable {
 
     @ApiModelProperty(value = "毕业时间")
     @TableField(value = "graduation_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date graduationTime;
 
     @ApiModelProperty(value = "原工作单位")
@@ -107,6 +110,7 @@ public class SysUserInfo implements Serializable {
 
     @ApiModelProperty(value = "入司时间")
     @TableField(value = "entry_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date entryTime;
 
     @ApiModelProperty(value = "代理人资格证号")

src/main/java/com/ydtech/modules/admin/model/dto/SysUserDto.java

@@ -35,5 +35,5 @@ public class SysUserDto extends PageRequest {
     private String status;
 
     @ApiModelProperty("代理个代标识")
-    private String agentFlag;
+    private Integer agentFlag;
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserRecruitingServiceImpl.java

@@ -20,10 +20,7 @@ public class SysUserRecruitingServiceImpl implements SysUserRecruitingService {
     @Override
     public HttpResult<Object> queryType(String deptId) {
         SysDept sysDept = sysDeptService.getById(deptId);
-        // 查询上级机构个代还是出单员
-        String parentId = sysDept.getParentId();
-        SysDept sysDeptParent = sysDeptService.getById(parentId);
-        String managementSource = sysDeptParent.getManagementSource();
+        String managementSource = sysDept.getManagementSource();
         AssertionUtils.isFail(StringUtils.isEmpty(managementSource), "此机构暂时不支持增员");
         OrganizationSource.Source source = Enum.valueOf(OrganizationSource.Source.class, OrganizationSource.Source.NAME + managementSource);
         return HttpResult.ok(source.getDesc(), source.getCode());

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -78,7 +78,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (sysUserVO.getAgentFlag() == null) {
             throw new SystemException("必传标识未传递");
         }
-
         return sysUserMapper.findUserList(page, sysUserVO);
     }
 

src/main/java/com/ydtech/modules/inv/model/InvAccountIncoice.java

@@ -14,6 +14,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 发票管理表(InvAccountIncoice)表实体类
@@ -101,6 +102,11 @@ public class InvAccountIncoice implements Serializable{
     @TableField(exist = false)
     private String payoutDate;
 
+    @ApiModelProperty(value = "进账日期")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private LocalDate payoutTime;
+
     @ApiModelProperty(value = "进账卡号")
     private String revBankCardNum;
 

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -140,7 +140,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         invAccountOperate.setFundUse(invAccountIncoice.getFundUse());
         invAccountOperate.setFundFen(invAccountIncoice.getFundFen());
         invAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        invAccountOperate.setCreateTime(LocalDateTime.now());
+        invAccountOperate.setCreateTime(invAccountIncoice.getPayoutTime().atStartOfDay());
         invAccountOperate.setEntProfit(entProfit);
         invAccountOperate.setDel(String.valueOf(date.getTime()));
         invAccountOperate.setOutCardNum(outCard.getBankCardNum());
@@ -159,7 +159,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         outInvAccountOperate.setFundUse(invAccountIncoice.getFundUse());
         outInvAccountOperate.setFundFen(invAccountIncoice.getFundFen());
         outInvAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        outInvAccountOperate.setCreateTime(LocalDateTime.now());
+        outInvAccountOperate.setCreateTime(invAccountIncoice.getPayoutTime().atStartOfDay());
         outInvAccountOperate.setOutProfit(outProfit);
         outInvAccountOperate.setDel(String.valueOf(date.getTime()));
         outInvAccountOperate.setOutCardNum(outCard.getBankCardNum());
@@ -334,8 +334,15 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             }
 
         } else {
-            list = new ArrayList<>();
-            invAccountIncoices = selectExcel(lambdaQuery, invAccountIncoiceQueryVo);
+            LambdaQueryWrapper<InvAccountOperate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.isNotNull(InvAccountOperate::getInvoiceId);
+            list = invAccountOperateService.list(lambdaQueryWrapper);
+            List<String> collect = list.stream().map(InvAccountOperate::getInvoiceId).collect(Collectors.toList());
+            //将开票id集合放入查询中
+            if (!collect.isEmpty()) {
+                lambdaQuery.in(InvAccountIncoice::getInvoiceId, collect);
+                invAccountIncoices = selectExcel(lambdaQuery, invAccountIncoiceQueryVo);
+            }
         }
 
 
@@ -440,6 +447,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             invAccountIncoiceResult1.setCurrent(invAccountIncoice.getPageNo());
             invAccountIncoiceResult1.setTotal(invAccountIncoicePage.getTotal());
             invAccountIncoiceResult1.setSize(invAccountIncoice.getPageSize());
+            return invAccountIncoiceResult1;
         }
         invAccountIncoiceResult.setRecords(invAccountIncoicePage.getRecords());
         invAccountIncoiceResult.setCurrent(invAccountIncoice.getPageNo());

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountOperateServiceImpl.java

@@ -249,6 +249,11 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
 
             if(invAccountOperate.getInvoiceId() != null){
                 InvAccountIncoice byId = invAccountIncoiceService.getById(invAccountOperate.getInvoiceId());
+
+                if (new BigDecimal(byId.getPayoutMoney()).compareTo(new BigDecimal(invAccountOperate.getApplyAmount())) < 0){
+                    throw new SystemException("撤销金额大于已进账金额");
+                }
+
                 byId.setPayoutMoney(new BigDecimal(byId.getPayoutMoney()).subtract(new BigDecimal(invAccountOperate.getApplyAmount())).toString());
                 byId.setNotPayoutMoney(new BigDecimal(byId.getNotPayoutMoney()).add(new BigDecimal(invAccountOperate.getApplyAmount())).toString());
                 invAccountIncoiceService.updateById(byId);

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -162,9 +162,12 @@
             <if test='user.roleId !=null and user.roleId!=""  '>
                 and t3.role_id in (${user.roleId})
             </if>
-            <if test="user.agentFlag !=null and user.agentFlag!='' ">
+            <if test="user.agentFlag !=null and user.agentFlag != 0 ">
                 and sd.management_source = #{user.agentFlag}
             </if>
+            <if test="user.agentFlag != null and user.agentFlag == 0">
+                and sd.management_source is null
+            </if>
         </if>
     </select>