完成捐款支付调用

common/src/main/java/com/sien/common/controller/WxPayController.java

@@ -33,8 +33,6 @@ public class WxPayController {
     @PostMapping("/notify/donationOrder")
     @PostMapping("/notify/donationOrder")
     public String parseDonationOrderNotifyResult(@RequestBody String xmlData) throws WxPayException {
     public String parseDonationOrderNotifyResult(@RequestBody String xmlData) throws WxPayException {
         return donationRecordService.parseDonationOrderNotifyResult(xmlData);
         return donationRecordService.parseDonationOrderNotifyResult(xmlData);
-
-
     }
     }
 
 
     @ApiOperation(value = "会员充值支付回调通知处理")
     @ApiOperation(value = "会员充值支付回调通知处理")

common/src/main/java/com/sien/common/param/VipRecordOpenParam.java

@@ -41,10 +41,6 @@ public class VipRecordOpenParam extends BasePageOrderParam {
     @ApiModelProperty("是否代替他人开通")
     @ApiModelProperty("是否代替他人开通")
     private Boolean isReplace;
     private Boolean isReplace;
 
 
-//    @NotBlank(message = "不能为空")
-//    @ApiModelProperty("替他人开通,接收人userId, ")
-//    private Long agentUserId;
-
     @ApiModelProperty("捐款接收用户手机号,当isAgent=1为必填")
     @ApiModelProperty("捐款接收用户手机号,当isAgent=1为必填")
     private String userPhone;
     private String userPhone;
 
 

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

@@ -35,6 +35,10 @@ import java.io.Serializable;
 @Validated
 @Validated
 public class AppSmsRegisterParam implements Serializable {
 public class AppSmsRegisterParam implements Serializable {
 
 
+    @NotBlank(message = "姓名")
+    @ApiModelProperty(value = "姓名", example = "何", required = true)
+    private String userName;
+
     @NotBlank(message = "请输入手机区号")
     @NotBlank(message = "请输入手机区号")
     @ApiModelProperty(value = "手机区号", example = "86", required = true)
     @ApiModelProperty(value = "手机区号", example = "86", required = true)
     private String phoneArea;
     private String phoneArea;
@@ -51,6 +55,4 @@ public class AppSmsRegisterParam implements Serializable {
     @NotBlank(message = "请输入openId")
     @NotBlank(message = "请输入openId")
     private String openId;
     private String openId;
 
 
-//    @ApiModelProperty("姓名")
-//    private String nickname;
 }
 }

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

@@ -19,13 +19,13 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "AppUserInfoParam对象")
 @ApiModel(value = "AppUserInfoParam对象")
 public class AppUserInfoParam extends BaseEntity {
 public class AppUserInfoParam extends BaseEntity {
 
 
-    @ApiModelProperty("用户名")
+    @ApiModelProperty("用户姓名")
     private String username;
     private String username;
 
 
     @ApiModelProperty("微信id")
     @ApiModelProperty("微信id")
     private String wechatOpenId;
     private String wechatOpenId;
 
 
-    @ApiModelProperty("姓名")
+    @ApiModelProperty("微信昵称")
     private String nickname;
     private String nickname;
 
 
     @ApiModelProperty("证件号码")
     @ApiModelProperty("证件号码")

common/src/main/java/com/sien/common/service/DonationRecordService.java

@@ -37,10 +37,19 @@ public interface DonationRecordService extends BaseService<DonationRecord> {
     boolean saveDonationRecord(DonationRecord donationRecord) throws Exception;
     boolean saveDonationRecord(DonationRecord donationRecord) throws Exception;
 
 
 
 
-    // 回调
+    /**
+     * 回调
+     */
     String parseDonationOrderNotifyResult(String xmlData);
     String parseDonationOrderNotifyResult(String xmlData);
 
 
 
 
+    /**
+     * 我要捐款
+     *
+     * @param donationRecordAdd
+     * @return
+     * @throws Exception
+     */
     ApiResult<WxPayMpOrderResult> add(DonationRecordAdd donationRecordAdd) throws Exception;
     ApiResult<WxPayMpOrderResult> add(DonationRecordAdd donationRecordAdd) throws Exception;
 
 
     /**
     /**

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

@@ -118,13 +118,13 @@ public class AppUserApiServiceImpl implements AppUserApiService {
             return appUserService.login(loginParam, language, true);
             return appUserService.login(loginParam, language, true);
         }
         }
 
 
-        // 没注册则先保存到数据库
+        // 没注册则保存到数据库
         AppUser appUserByOpenId = appUserService.getOne(new QueryWrapper<AppUser>().lambda().eq(AppUser::getWechatOpenId, loginParam.getOpenId()));
         AppUser appUserByOpenId = appUserService.getOne(new QueryWrapper<AppUser>().lambda().eq(AppUser::getWechatOpenId, loginParam.getOpenId()));
         appUserByOpenId.setPhoneArea(loginParam.getPhoneArea());
         appUserByOpenId.setPhoneArea(loginParam.getPhoneArea());
         appUserByOpenId.setPhone(loginParam.getPhone());
         appUserByOpenId.setPhone(loginParam.getPhone());
-        boolean isDbOk = appUserService.updateById(appUserByOpenId);
-
+        appUserByOpenId.setUsername(loginParam.getUserName());
 
 
+        boolean isDbOk = appUserService.updateById(appUserByOpenId);
         if (!isDbOk) {
         if (!isDbOk) {
             return ApiResult.fail(ApiCode.SPRING_BOOT_PLUS_EXCEPTION, new LoginAppUserTokenVo());
             return ApiResult.fail(ApiCode.SPRING_BOOT_PLUS_EXCEPTION, new LoginAppUserTokenVo());
         }
         }

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

@@ -106,8 +106,6 @@ public class DonationRecordServiceImpl extends BaseServiceImpl<DonationRecordMap
         super.updateById(donationRecord);
         super.updateById(donationRecord);
 
 
         return WxPayNotifyResponse.successResp("成功");
         return WxPayNotifyResponse.successResp("成功");
-        // 根据自己业务场景需要构造返回对象
-//        return WxPayNotifyResponse.success("成功");
     }
     }
 
 
 
 

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

@@ -17,7 +17,7 @@ import java.io.Serializable;
  */
  */
 @Data
 @Data
 @Accessors(chain = true)
 @Accessors(chain = true)
-@ApiModel(value = "AppUserQueryVo对象")
+@ApiModel(value = "AppUserQueryVo")
 public class AppUserQueryVo implements Serializable {
 public class AppUserQueryVo implements Serializable {
 
 
     @ApiModelProperty("用户名")
     @ApiModelProperty("用户名")
@@ -26,7 +26,7 @@ public class AppUserQueryVo implements Serializable {
     @ApiModelProperty("微信id")
     @ApiModelProperty("微信id")
     private String wechatOpenId;
     private String wechatOpenId;
 
 
-    @ApiModelProperty("姓名")
+    @ApiModelProperty("微信昵称")
     private String nickname;
     private String nickname;
 
 
     @ApiModelProperty("证件号码")
     @ApiModelProperty("证件号码")