From 3b4f1cc6e18671f7fb53ede9deb88e51d21b6bc4 Mon Sep 17 00:00:00 2001 From: wu Date: Sat, 7 Oct 2023 17:30:06 +0800 Subject: [PATCH] bugfix --- .../system/SysProfileController.java | 9 +- .../controller/system/SysUserController.java | 10 +- .../controller/BActivityPointsController.java | 5 +- .../zhiyuanzhe/domain/BActivityUser.java | 3 +- .../domain/BDistributionRecords.java | 7 ++ .../impl/BActivityPointsServiceImpl.java | 2 + .../service/impl/BActivityServiceImpl.java | 9 +- .../impl/PointsRedemptionServiceImpl.java | 4 +- .../common/core/domain/entity/SysUser.java | 77 ++++++++---- .../resources/mapper/system/SysUserMapper.xml | 114 +++++++++++++++--- .../zhiyuanzhe/BActivityPointsMapper.xml | 15 +-- .../zhiyuanzhe/BDistributionRecordsMapper.xml | 16 ++- 12 files changed, 199 insertions(+), 72 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 9eccf51..f6fd329 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/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)) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 0eeafc1..a4ce796 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/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; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/controller/BActivityPointsController.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/controller/BActivityPointsController.java index ade7928..76fc437 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/controller/BActivityPointsController.java +++ b/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; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BActivityUser.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BActivityUser.java index 4e23079..e10b13f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BActivityUser.java +++ b/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:已报名 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BDistributionRecords.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BDistributionRecords.java index 51bcc97..39a7d3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BDistributionRecords.java +++ b/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; + + /** * 联系方式 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityPointsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityPointsServiceImpl.java index 4ac02b6..3e73a17 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityPointsServiceImpl.java +++ b/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()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityServiceImpl.java index bd20391..8215cd5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityServiceImpl.java +++ b/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 collect = list.stream().filter(x -> x.getDegreeOfMatch().compareTo(BigDecimal.ONE) > 0) + List 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 collect = list.stream().filter(x -> x.getDegreeOfMatch().compareTo(BigDecimal.ONE) > 0) + List collect = list.stream().filter(x -> x.getDegreeOfMatch() > 0) .collect(Collectors.toList()); activityUserService.addList(collect); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/PointsRedemptionServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/PointsRedemptionServiceImpl.java index 5f8616a..131ae5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/PointsRedemptionServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/PointsRedemptionServiceImpl.java @@ -49,7 +49,7 @@ public class PointsRedemptionServiceImpl implements PointsRedemptionService { */ @Override public List 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("积分不足"); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index be91be9..5e3e799 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/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) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("address", getAddress()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .toString(); + return "SysUser{" + + "userId=" + userId + + ", deptId=" + deptId + + ", userName='" + userName + '\'' + + ", nickName='" + nickName + '\'' + + ", email='" + email + '\'' + + ", phonenumber='" + phonenumber + '\'' + + ", sex='" + sex + '\'' + + ", avatar='" + avatar + '\'' + + ", password='" + password + '\'' + + ", address='" + address + '\'' + + ", consigneeName='" + consigneeName + '\'' + + ", consigneePhonenumber='" + consigneePhonenumber + '\'' + + ", status='" + status + '\'' + + ", delFlag='" + delFlag + '\'' + + ", loginIp='" + loginIp + '\'' + + ", loginDate=" + loginDate + + ", dept=" + dept + + ", roles=" + roles + + ", roleIds=" + Arrays.toString(roleIds) + + ", postIds=" + Arrays.toString(postIds) + + ", roleId=" + roleId + + '}'; } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 9e3a8b6..2156238 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -24,6 +24,8 @@ + + @@ -49,6 +51,8 @@ select u.address, + u.consignee_name, + u.consignee_phonenumber, u.user_id, u.dept_id, u.user_name, @@ -85,8 +89,26 @@ - SELECT * + select bap.id, bap.u_id, - su.nick_name as user_name, - su.phonenumber, + su.consignee_name as user_name, + 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, - bap.update_time AS timeOfIssuance + END AS issuanceStatus, + 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 diff --git a/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BDistributionRecordsMapper.xml b/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BDistributionRecordsMapper.xml index 5844288..569e6ab 100644 --- a/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BDistributionRecordsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BDistributionRecordsMapper.xml @@ -14,9 +14,9 @@ + - @@ -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, - (select phonenumber from sys_user where user_id = bdr.u_id) as phonenumber, + bdr.consignee_name as user_name, + 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, - (select phonenumber from sys_user where user_id = bdr.u_id) as phonenumber, + bdr.consignee_name as user_name, + bdr.phonenumber, bdr.type, bdr.cre_type, bdr.status, @@ -192,6 +192,8 @@ dept_id, type, cre_type, + consignee_name, + phonenumber, #{activityId}, @@ -212,6 +214,8 @@ #{deptId}, #{type}, #{creType}, + #{consigneeName}, + #{phonenumber}, @@ -236,6 +240,8 @@ dept_id = #{deptId}, type = #{type}, cre_type = #{creType}, + consignee_name = #{consigneeName}, + phonenumber = #{phonenumber}, where id = #{id}