Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/entity/CompanyVO.java

@@ -382,6 +382,20 @@ public class CompanyVO extends PageInfo<CompanyVO> implements Serializable {
     private Integer cpIdFrom;
 
     /**
+     * 所有者 (t_wx_user)--来源公司
+     */
+    @ApiModelProperty(value = "所有者 (t_wx_user)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String userIdFrom;
+
+    /**
+     * 员工--来源公司
+     */
+    @ApiModelProperty(value = "员工--来源公司")
+    private String staffNameFrom;
+
+
+    /**
      * 分享的截止日期时间
      */
     @ApiModelProperty(value = "分享的截止日期时间")

src/main/java/com/dk/oauth/mapper/integral/IntegralItemMapper.xml

@@ -113,6 +113,7 @@
         left join dkic_a.t_a_company tac on tac.cp_id = tmii.cp_id
         left join dkic_a.t_a_company tacf on tacf.cp_id = tmii.cp_id
         <include refid="Condition"/>
+        order by tmii.acc_date desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/oauth/model/VO/integral/SignRecordVO.java

@@ -91,6 +91,13 @@ public class SignRecordVO  {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    /**
+     * 操作员工
+     */
+    @Excel(name = "操作员工")
+    @ApiModelProperty(value = "操作员工")
+    private String staffName;
+
 
     /*
      * 相关属性

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -262,6 +262,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }
         companyMapper.insert(company);
 
+        // 生成员工
+        UserLogin userLogin = userMapper.selectById(companyVO.getOwner());
+
         //  来源公司Id 分享的截止日期时间 是否超过 当前的日期时间 说明过期了，过期不加积分 240724
         if (companyVO.getCpIdFrom() != null && companyVO.getShareEndTime() != null
                 && companyVO.getShareEndTime().compareTo(LocalDateTime.now()) > 0) {
@@ -277,6 +280,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 integralItem.setCpIdFrom(companyVO.getCpIdFrom());
                 integralItem.setAccDate(LocalDateTime.now());
                 integralItem.setUserId(companyVO.getOwner());
+                // 新注册的公司的人员
+                integralItem.setStaffName(userLogin.getUserPhone());
                 integralItemMapper.insert(integralItem);
                 // 积分 新公司的
                 Integral integral = new Integral();
@@ -293,11 +298,14 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
 
                 // 积分明细 来源公司公司的
                 integralItem = new IntegralItem();
-                integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_INVITE.getName());
+//                邀请的注册
+                integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_REGISTER.getName());
                 integralItem.setIntegral(integralTactic.getShareRegIntegral());
                 integralItem.setCpId(companyVO.getCpIdFrom());
                 integralItem.setAccDate(LocalDateTime.now());
-                integralItem.setUserId(companyVO.getOwner());
+                integralItem.setUserId(companyVO.getUserIdFrom());
+                // 来源公司公司的人员
+                integralItem.setStaffName(companyVO.getStaffNameFrom());
                 integralItemMapper.insert(integralItem);
                 // 积分明细 来源公司公司的
                 integral = new Integral();
@@ -358,8 +366,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             orgResponse = orgResponseResponseResultVO.getData();
         }
 
-        // 生成员工
-        UserLogin userLogin = userMapper.selectById(company.getOwner());
+
         StaffVO staffVO = new StaffVO();
         staffVO.setWxUserId(userLogin.getUserId());
         staffVO.setCpId(company.getCpId());

src/main/java/com/dk/oauth/service/integral/SignRecordService.java

@@ -163,6 +163,7 @@ public class SignRecordService extends BaseService<SignRecord> {
         integralItem.setCpId(signRecordVO.getCpId());
         integralItem.setAccDate(LocalDateTime.now());
         integralItem.setUserId(signRecordVO.getUserId());
+        integralItem.setStaffName(signRecordVO.getStaffName());
         integralItemMapper.insert(integralItem);
         // 更新或插入总积分的数据
         // 积分 新公司的