判断接收人不能为自己

common/src/main/java/com/sien/common/param/app/AppSmsRegisterParam.java

@@ -36,7 +36,7 @@ import java.io.Serializable;
 public class AppSmsRegisterParam implements Serializable {
 public class AppSmsRegisterParam implements Serializable {
 
 
     @NotBlank(message = "姓名")
     @NotBlank(message = "姓名")
-    @ApiModelProperty(value = "姓名", example = "何", required = true)
+    @ApiModelProperty(value = "用户姓名", example = "何", required = true)
     private String userName;
     private String userName;
 
 
     @NotBlank(message = "请输入手机区号")
     @NotBlank(message = "请输入手机区号")

common/src/main/java/com/sien/common/service/impl/DonationRecordServiceImpl.java

@@ -141,13 +141,21 @@ public class DonationRecordServiceImpl extends BaseServiceImpl<DonationRecordMap
 
 
         // 捐款接收人, 如果为别人捐款
         // 捐款接收人, 如果为别人捐款
         if (donationRecordAdd.getIsReplace() == 1) {
         if (donationRecordAdd.getIsReplace() == 1) {
+
+
+            // 判断接收人不能为自己
+            if (appUserById.getPhoneArea().equals(donationRecordAdd.getPhoneArea()) &&
+                    appUserById.getPhone().equals(donationRecordAdd.getUserPhone())) {
+                return ApiResult.fail(ApiCode.PHONE_IS_ME, new WxPayMpOrderResult());
+            }
+
             AppUser user = appUserService.getOne(new QueryWrapper<AppUser>().lambda()
             AppUser user = appUserService.getOne(new QueryWrapper<AppUser>().lambda()
                     .eq(AppUser::getPhone, donationRecordAdd.getUserPhone())
                     .eq(AppUser::getPhone, donationRecordAdd.getUserPhone())
                     .eq(AppUser::getPhoneArea, donationRecordAdd.getPhoneArea()));
                     .eq(AppUser::getPhoneArea, donationRecordAdd.getPhoneArea()));
 
 
             //判断接收方是否存在
             //判断接收方是否存在
             if (user == null) {
             if (user == null) {
-                return ApiResult.fail(ApiCode.FAIL, new WxPayMpOrderResult());
+                return ApiResult.fail(ApiCode.USER_NOT_FOUND, new WxPayMpOrderResult());
             }
             }
             donationRecord.setFkUserId(user.getId());
             donationRecord.setFkUserId(user.getId());
 
 

common/src/main/java/com/sien/common/service/impl/VipRecordServiceImpl.java

@@ -172,12 +172,19 @@ public class VipRecordServiceImpl extends BaseServiceImpl<VipRecordMapper, VipRe
 
 
 //        // 判断是否为替他人
 //        // 判断是否为替他人
         if (vipOpenParam.getIsReplace() == 1) {
         if (vipOpenParam.getIsReplace() == 1) {
+
+            // 判断接收人不能为自己
+            if (appUserById.getPhoneArea().equals(vipOpenParam.getPhoneArea()) &&
+                    appUserById.getPhone().equals(vipOpenParam.getUserPhone())) {
+                return ApiResult.fail(ApiCode.PHONE_IS_ME, new WxPayMpOrderResult());
+            }
+
             AppUser user = appUserService.getOne(new QueryWrapper<AppUser>().lambda()
             AppUser user = appUserService.getOne(new QueryWrapper<AppUser>().lambda()
                     .eq(AppUser::getPhone, vipOpenParam.getUserPhone())
                     .eq(AppUser::getPhone, vipOpenParam.getUserPhone())
                     .eq(AppUser::getPhoneArea, vipOpenParam.getPhoneArea()));
                     .eq(AppUser::getPhoneArea, vipOpenParam.getPhoneArea()));
             //判断接收方是否存在
             //判断接收方是否存在
             if (user == null) {
             if (user == null) {
-                return ApiResult.fail(ApiCode.FAIL, new WxPayMpOrderResult());
+                return ApiResult.fail(ApiCode.USER_NOT_FOUND, new WxPayMpOrderResult());
             }
             }
             vipRecord.setFkUserId(user.getId());
             vipRecord.setFkUserId(user.getId());
             vipRecord.setFkRechargeUser(jwtToken.getUserId());
             vipRecord.setFkRechargeUser(jwtToken.getUserId());

common/src/main/java/com/sien/common/vo/AppUserQueryVo.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 @ApiModel(value = "AppUserQueryVo")
 @ApiModel(value = "AppUserQueryVo")
 public class AppUserQueryVo implements Serializable {
 public class AppUserQueryVo implements Serializable {
 
 
-    @ApiModelProperty("用户名")
+    @ApiModelProperty("用户姓名")
     private String username;
     private String username;
 
 
     @ApiModelProperty("微信id")
     @ApiModelProperty("微信id")

config/src/main/resources/static/i18n/messages_zh_CN.properties

@@ -82,3 +82,4 @@ api.response.code.user.USER_NOT_FOUND=用户不存在
 api.response.code.user.USER_WECHAT_CODE=微信code错误
 api.response.code.user.USER_WECHAT_CODE=微信code错误
 api.response.code.user.SMS_CODE_ERROR_NEW=新手机号验证码错误
 api.response.code.user.SMS_CODE_ERROR_NEW=新手机号验证码错误
 api.response.code.user.UPDATA_PHONE_USE=绑定手机已经被使用
 api.response.code.user.UPDATA_PHONE_USE=绑定手机已经被使用
+api.response.code.user.PHONE_IS_ME=手机号不能为自己

framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java

@@ -140,6 +140,12 @@ public enum ApiCode {
      */
      */
     UPDATA_PHONE_USE(6006, "api.response.code.user.UPDATA_PHONE_USE"),
     UPDATA_PHONE_USE(6006, "api.response.code.user.UPDATA_PHONE_USE"),
 
 
+    /**
+     * 手机号不能为自己
+     */
+    PHONE_IS_ME(6009, "api.response.code.user.PHONE_IS_ME"),
+
+
     ;
     ;
 
 
     private final int code;
     private final int code;