bugfix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -13,7 +13,6 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -23,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+
 /**
  * 个人信息 业务处理
  *
@@ -31,10 +32,10 @@ import org.springframework.web.multipart.MultipartFile;
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {
-    @Autowired
+    @Resource
     private ISysUserService userService;
 
-    @Autowired
+    @Resource
     private TokenService tokenService;
 
     /**
@@ -61,6 +62,8 @@ public class SysProfileController extends BaseController {
         currentUser.setNickName(user.getNickName());
         currentUser.setEmail(user.getEmail());
         currentUser.setAddress(user.getAddress());
+        currentUser.setConsigneeName(user.getConsigneeName());
+        currentUser.setConsigneePhonenumber(user.getConsigneePhonenumber());
         currentUser.setPhonenumber(user.getPhonenumber());
         currentUser.setSex(user.getSex());
         if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser)) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -16,7 +16,6 @@ import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -29,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -41,16 +41,16 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {
-    @Autowired
+    @Resource
     private ISysUserService userService;
 
-    @Autowired
+    @Resource
     private ISysRoleService roleService;
 
-    @Autowired
+    @Resource
     private ISysDeptService deptService;
 
-    @Autowired
+    @Resource
     private ISysPostService postService;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/controller/BActivityPointsController.java

@@ -11,7 +11,6 @@ import com.ruoyi.zhiyuanzhe.domain.request.BActivityPointsRequest;
 import com.ruoyi.zhiyuanzhe.service.IBActivityPointsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
@@ -35,7 +35,8 @@ import java.util.List;
 @RequestMapping("/zhiyuanzhe/points")
 @Transactional(rollbackFor = Exception.class)
 public class BActivityPointsController extends BaseController {
-    @Autowired
+
+    @Resource
     private IBActivityPointsService bActivityPointsService;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BActivityUser.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 
 /**
@@ -43,7 +42,7 @@ public class BActivityUser implements Serializable {
      * 匹配度
      */
     @ApiModelProperty(value = "匹配度")
-    private BigDecimal degreeOfMatch;
+    private Double degreeOfMatch;
 
     /**
      * 状态 0:未邀请 1:已邀请 2:已报名

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BDistributionRecords.java

@@ -113,6 +113,13 @@ public class BDistributionRecords extends BaseEntity {
     @ApiModelProperty(value = "邮寄地址")
     private String address;
 
+    /**
+     * 收货人名称
+     */
+    @Excel(name = "收货人名称")
+    private String consigneeName;
+
+
     /**
      * 联系方式
      */

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityPointsServiceImpl.java

@@ -125,6 +125,8 @@ public class BActivityPointsServiceImpl implements IBActivityPointsService {
         }
         records.setUId(SecurityUtils.getUserId());
         records.setAddress(sysUser.getAddress());
+        records.setPhonenumber(sysUser.getConsigneePhonenumber());
+        records.setConsigneeName(sysUser.getConsigneeName());
         records.setActivityId(req.getId());
         records.setCreType(1);
         records.setType(req.getType());

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityServiceImpl.java

@@ -18,7 +18,6 @@ import com.ruoyi.zhiyuanzhe.service.IBPersonTagsService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -90,12 +89,12 @@ public class BActivityServiceImpl implements IBActivityService {
         list.forEach(x -> {
             x.setStatus(0);
             if (score != 0) {
-                BigDecimal mul = NumberUtil.mul(NumberUtil.div(x.getDegreeOfMatch(), score, 0), 100);
+                Double mul = NumberUtil.mul(NumberUtil.div(x.getDegreeOfMatch(), new Double(score), 2), 100);
                 x.setDegreeOfMatch(mul);
             }
             x.setActivityId(bActivity.getId());
         });
-        List<BActivityUser> collect = list.stream().filter(x -> x.getDegreeOfMatch().compareTo(BigDecimal.ONE) > 0)
+        List<BActivityUser> collect = list.stream().filter(x -> x.getDegreeOfMatch() > 0)
                 .collect(Collectors.toList());
         activityUserService.addList(collect);
     }
@@ -158,12 +157,12 @@ public class BActivityServiceImpl implements IBActivityService {
         list.forEach(x -> {
             x.setStatus(0);
             if (score != 0) {
-                BigDecimal mul = NumberUtil.mul(NumberUtil.div(x.getDegreeOfMatch(), score, 0), 100);
+                Double mul = NumberUtil.mul(NumberUtil.div(x.getDegreeOfMatch(), new Double(score), 2), 100);
                 x.setDegreeOfMatch(mul);
             }
             x.setActivityId(bActivity.getId());
         });
-        List<BActivityUser> collect = list.stream().filter(x -> x.getDegreeOfMatch().compareTo(BigDecimal.ONE) > 0)
+        List<BActivityUser> collect = list.stream().filter(x -> x.getDegreeOfMatch() > 0)
                 .collect(Collectors.toList());
         activityUserService.addList(collect);
     }

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/PointsRedemptionServiceImpl.java

@@ -49,7 +49,7 @@ public class PointsRedemptionServiceImpl implements PointsRedemptionService {
      */
     @Override
     public List<BCertificates> page(BCertificatesRequest bCertificates) {
-
+        bCertificates.setUserId(SecurityUtils.getUserId());
         return bCertificatesService.PagePointsRedemption(bCertificates);
     }
 
@@ -94,6 +94,8 @@ public class PointsRedemptionServiceImpl implements PointsRedemptionService {
             entity.setUId(userId);
             entity.setStatus(2);
             entity.setAddress(sysUser.getAddress());
+            entity.setPhonenumber(sysUser.getConsigneePhonenumber());
+            entity.setConsigneeName(sysUser.getConsigneeName());
             bDistributionRecordsService.insertBDistributionRecords(entity);
         } else {
             throw new ServiceException("积分不足");

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -6,12 +6,11 @@ import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -81,6 +80,19 @@ public class SysUser extends BaseEntity {
     @Excel(name = "地址")
     private String address;
 
+    /**
+     * 收货人名称
+     */
+    @Excel(name = "收货人名称")
+    private String consigneeName;
+
+
+    /**
+     * 收货人手机号码
+     */
+    @Excel(name = "收货人手机号码")
+    private String consigneePhonenumber;
+
     /**
      * 帐号状态（0正常 1停用）
      */
@@ -145,6 +157,22 @@ public class SysUser extends BaseEntity {
         return userId != null && 1L == userId;
     }
 
+    public String getConsigneeName() {
+        return consigneeName;
+    }
+
+    public void setConsigneeName(String consigneeName) {
+        this.consigneeName = consigneeName;
+    }
+
+    public String getConsigneePhonenumber() {
+        return consigneePhonenumber;
+    }
+
+    public void setConsigneePhonenumber(String consigneePhonenumber) {
+        this.consigneePhonenumber = consigneePhonenumber;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -311,27 +339,28 @@ public class SysUser extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        return "SysUser{" +
-                .append("userId", getUserId())
+                "userId=" + userId +
-                .append("deptId", getDeptId())
+                ", deptId=" + deptId +
-                .append("userName", getUserName())
+                ", userName='" + userName + '\'' +
-                .append("nickName", getNickName())
+                ", nickName='" + nickName + '\'' +
-                .append("email", getEmail())
+                ", email='" + email + '\'' +
-                .append("phonenumber", getPhonenumber())
+                ", phonenumber='" + phonenumber + '\'' +
-                .append("sex", getSex())
+                ", sex='" + sex + '\'' +
-                .append("avatar", getAvatar())
+                ", avatar='" + avatar + '\'' +
-                .append("password", getPassword())
+                ", password='" + password + '\'' +
-                .append("status", getStatus())
+                ", address='" + address + '\'' +
-                .append("delFlag", getDelFlag())
+                ", consigneeName='" + consigneeName + '\'' +
-                .append("loginIp", getLoginIp())
+                ", consigneePhonenumber='" + consigneePhonenumber + '\'' +
-                .append("loginDate", getLoginDate())
+                ", status='" + status + '\'' +
-                .append("createBy", getCreateBy())
+                ", delFlag='" + delFlag + '\'' +
-                .append("address", getAddress())
+                ", loginIp='" + loginIp + '\'' +
-                .append("createTime", getCreateTime())
+                ", loginDate=" + loginDate +
-                .append("updateBy", getUpdateBy())
+                ", dept=" + dept +
-                .append("updateTime", getUpdateTime())
+                ", roles=" + roles +
-                .append("remark", getRemark())
+                ", roleIds=" + Arrays.toString(roleIds) +
-                .append("dept", getDept())
+                ", postIds=" + Arrays.toString(postIds) +
-                .toString();
+                ", roleId=" + roleId +
+                '}';
     }
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -24,6 +24,8 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="address" column="address"/>
+        <result property="consigneeName" column="consignee_name"/>
+        <result property="consigneePhonenumber" column="consignee_phonenumber"/>
         <association property="dept" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
@@ -49,6 +51,8 @@
 
     <sql id="selectUserVo">
         select u.address,
+               u.consignee_name,
+               u.consignee_phonenumber,
                u.user_id,
                u.dept_id,
                u.user_name,
@@ -85,8 +89,26 @@
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-        select u.address, u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
+        select u.address,
-        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
+        u.consignee_name,
+        u.consignee_phonenumber,
+        u.user_id,
+        u.dept_id,
+        u.nick_name,
+        u.user_name,
+        u.email,
+        u.avatar,
+        u.phonenumber,
+        u.sex,
+        u.status,
+        u.del_flag,
+        u.login_ip,
+        u.login_date,
+        u.create_by,
+        u.create_time,
+        u.remark,
+        d.dept_name,
+        d.leader from
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
@@ -117,7 +139,16 @@
     </select>
 
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.address,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status,
+        select distinct u.address,
+        u.consignee_name,
+        u.consignee_phonenumber,
+        u.user_id,
+        u.dept_id,
+        u.user_name,
+        u.nick_name,
+        u.email,
+        u.phonenumber,
+        u.status,
         u.create_time
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
@@ -135,7 +166,16 @@
     </select>
 
     <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.address,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status,
+        select distinct u.address,
+        u.consignee_name,
+        u.consignee_phonenumber,
+        u.user_id,
+        u.dept_id,
+        u.user_name,
+        u.nick_name,
+        u.email,
+        u.phonenumber,
+        u.status,
         u.create_time
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
@@ -192,6 +232,8 @@
         insert into sys_user(
         <if test="userId != null and userId != 0">user_id,</if>
         <if test="address != null and address != ''">address,</if>
+        <if test="consigneeName != null and consigneeName != ''">consignee_name,</if>
+        <if test="consigneePhonenumber != null and consigneePhonenumber != ''">consignee_phonenumber,</if>
         <if test="deptId != null and deptId != 0">dept_id,</if>
         <if test="userName != null and userName != ''">user_name,</if>
         <if test="nickName != null and nickName != ''">nick_name,</if>
@@ -207,6 +249,8 @@
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="address != null and address != ''">#{address},</if>
+        <if test="consigneeName != null and consigneeName != ''">#{consigneeName},</if>
+        <if test="consigneePhonenumber != null and consigneePhonenumber != ''">#{consigneePhonenumber},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
         <if test="userName != null and userName != ''">#{userName},</if>
         <if test="nickName != null and nickName != ''">#{nickName},</if>
@@ -225,20 +269,54 @@
     <update id="updateUser" parameterType="SysUser">
         update sys_user
         <set>
-            <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+            <if test="deptId != null and deptId != 0">
-            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+                dept_id = #{deptId},
-            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            </if>
-            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="userName != null and userName != ''">
-            <if test="email != null ">email = #{email},</if>
+                user_name = #{userName},
-            <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
+            </if>
-            <if test="sex != null and sex != ''">sex = #{sex},</if>
+            <if test="nickName != null and nickName != ''">
-            <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
+                nick_name = #{nickName},
-            <if test="password != null and password != ''">password = #{password},</if>
+            </if>
-            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="consigneeName != null and consigneeName != ''">
-            <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
+                consignee_name = #{consigneeName},
-            <if test="loginDate != null">login_date = #{loginDate},</if>
+            </if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="consigneePhonenumber != null and consigneePhonenumber != ''">
-            <if test="remark != null">remark = #{remark},</if>
+                consignee_phonenumber = #{consigneePhonenumber},
+            </if>
+            <if test="address != null and address != ''">
+                address = #{address},
+            </if>
+            <if test="email != null ">
+                email = #{email},
+            </if>
+            <if test="phonenumber != null ">
+                phonenumber = #{phonenumber},
+            </if>
+            <if test="sex != null and sex != ''">
+                sex = #{sex},
+            </if>
+            <if test="avatar != null and avatar != ''">
+                avatar = #{avatar},
+            </if>
+            <if test="password != null and password != ''">
+                password = #{password},
+            </if>
+            <if test="status != null and status != ''">
+                status = #{status},
+            </if>
+            <if test="loginIp != null and loginIp != ''">
+                login_ip = #{loginIp},
+            </if>
+            <if test="loginDate != null">
+                login_date = #{loginDate},
+            </if>
+            <if test="updateBy != null and updateBy != ''">
+                update_by = #{updateBy},
+            </if>
+            <if test="remark != null">
+                remark = #{remark},
+            </if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}

ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BActivityPointsMapper.xml

@@ -51,10 +51,11 @@
         from b_activity_points
     </sql>
 
-    <select id="selectBActivityPointsList" parameterType="BActivityPoints" resultType="BActivityPoints">
+    <select id="selectBActivityPointsList" parameterType="BActivityPoints" resultMap="BActivityPointsResult">
-        SELECT *
+        SELECT subquery.*
         FROM (
         select
+        (select nick_name from sys_user where user_id = bap.u_id) as user_name,
         bap.id,
         bap.u_id,
         bap.points,
@@ -104,11 +105,11 @@
     <select id="selectBActivityPointsById" parameterType="Long" resultMap="BActivityPointsResult">
         select bap.id,
                bap.u_id,
-               su.nick_name    as user_name,
+               su.consignee_name        as user_name,
-               su.phonenumber,
+               su.consignee_phonenumber as phonenumber,
                bdr.courier_companies,
                bdr.tracking_number,
-               bdr.address mail_address,
+               su.address               as mail_address,
                bdr.type,
                bap.points,
                bap.name,
@@ -128,8 +129,8 @@
                CASE
                    WHEN bdr.id IS NULL THEN 0
                    ELSE 1
-                   END         AS issuanceStatus,
+                   END                  AS issuanceStatus,
-               bap.update_time AS timeOfIssuance
+               bap.update_time          AS timeOfIssuance
         from b_activity_points bap
                  left join b_distribution_records bdr on bap.id = bdr.activity_id
                  left join sys_user su on bap.u_id = su.user_id

ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BDistributionRecordsMapper.xml

@@ -14,9 +14,9 @@
         <result property="cover" column="cover"/>
         <result property="userName" column="user_name"/>
         <result property="phonenumber" column="phonenumber"/>
+        <result property="consigneeName" column="consignee_name"/>
         <result property="address" column="address"/>
         <result property="status" column="status"/>
-        <result property="userName" column="user_name"/>
         <result property="courierCompanies" column="courier_companies"/>
         <result property="trackingNumber" column="tracking_number"/>
         <result property="createId" column="create_id"/>
@@ -65,8 +65,8 @@
         bc.name as certificate_name,
         bc.cover as cover,
         bdr.u_id,
-        (select nick_name from sys_user where user_id = bdr.u_id) as user_name,
+        bdr.consignee_name as user_name,
-        (select phonenumber from sys_user where user_id = bdr.u_id) as phonenumber,
+        bdr.phonenumber,
         bdr.type,
         bdr.cre_type,
         bdr.status,
@@ -134,8 +134,8 @@
                (select name from b_certificates where id = bdr.certificate_id)  as certificate_name,
                (select cover from b_certificates where id = bdr.certificate_id) as cover,
                bdr.u_id,
-               (select nick_name from sys_user where user_id = bdr.u_id)        as user_name,
+               bdr.consignee_name as user_name,
-               (select phonenumber from sys_user where user_id = bdr.u_id)      as phonenumber,
+               bdr.phonenumber,
                bdr.type,
                bdr.cre_type,
                bdr.status,
@@ -192,6 +192,8 @@
             <if test="deptId != null">dept_id,</if>
             <if test="type != null ">type,</if>
             <if test="creType != null ">cre_type,</if>
+            <if test="consigneeName != null ">consignee_name,</if>
+            <if test="phonenumber != null ">phonenumber,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="activityId != null">#{activityId},</if>
@@ -212,6 +214,8 @@
             <if test="deptId != null">#{deptId},</if>
             <if test="type != null ">#{type},</if>
             <if test="creType != null ">#{creType},</if>
+            <if test="consigneeName != null ">#{consigneeName},</if>
+            <if test="phonenumber != null ">#{phonenumber},</if>
         </trim>
     </insert>
 
@@ -236,6 +240,8 @@
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="type != null ">type = #{type},</if>
             <if test="creType != null ">cre_type = #{creType},</if>
+            <if test="consigneeName != null ">consignee_name = #{consigneeName},</if>
+            <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
         </trim>
         where id = #{id}
     </update>