Merge remote-tracking branch 'origin/test' into test

sys-api-service/pom.xml

@@ -81,6 +81,10 @@
             <artifactId>xy-es</artifactId>
             <version>1.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>xy-alipay</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
 </project>

sys-api-service/src/main/java/com/xy/entity/UserInfo.java

@@ -42,6 +42,15 @@ public class UserInfo extends BaseEntity3<UserInfo> implements Serializable {
     @ApiModelProperty(value = "微信开放平台识别码")
     private String unionid;
 
+    @ApiModelProperty(value = "微信小程序openid")
+    private String wechatOpenid;
+
+    @ApiModelProperty(value = "微信公众号openid")
+    private String mpOpenid;
+
+    @ApiModelProperty(value = "支付宝用户id")
+    private String aliUserId;
+
     @ApiModelProperty(value = "系统id")
     private Long sysId;
 

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -212,4 +212,19 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         }
         return R.ok(webUserMqttVo);
     }
+
+    @ApiOperation("修改微信信息")
+    @Override
+    public R updateByWechat(UserInfoDto.UpdateByWechat dto){
+        updateById(copy(UserInfo.class,dto));
+        return R.ok();
+    }
+
+    @ApiOperation("修改支付宝信息")
+    @Override
+    public R updateByAli(UserInfoDto.UpdateByAli dto){
+        updateById(copy(UserInfo.class,dto));
+        return R.ok();
+    }
+
 }

sys-api/src/main/java/com/xy/dto/UserInfoDto.java

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -155,6 +154,15 @@ public class UserInfoDto {
         @ApiModelProperty(value = "微信开放平台识别码")
         private String unionid;
 
+        @ApiModelProperty(value = "微信小程序openid")
+        private String wechatOpenid;
+
+        @ApiModelProperty(value = "微信公众号openid")
+        private String mpOpenid;
+
+        @ApiModelProperty(value = "支付宝用户id")
+        private String aliUserId;
+
         @ApiModelProperty(value = "系统id")
         private Long sysId;
 
@@ -224,4 +232,32 @@ public class UserInfoDto {
         @ApiModelProperty(value = "客户端id&topic")
         private String clientTopic;
     }
+
+    @Data
+    @Accessors(chain = true)
+    public static class UpdateByWechat{
+        @NotNull(message = "用户ID不能为空")
+        @ApiModelProperty(value = "id")
+        private Long userId;
+
+        @ApiModelProperty(value = "微信开放平台识别码")
+        private String unionid;
+
+        @ApiModelProperty(value = "微信小程序openid")
+        private String wechatOpenid;
+
+        @ApiModelProperty(value = "微信公众号openid")
+        private String mpOpenid;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class UpdateByAli{
+        @NotNull(message = "用户ID不能为空")
+        @ApiModelProperty(value = "id")
+        private Long userId;
+
+        @ApiModelProperty(value = "支付宝用户id")
+        private String aliUserId;
+    }
 }

sys-api/src/main/java/com/xy/service/UserInfoService.java

@@ -66,4 +66,21 @@ public interface UserInfoService {
      */
     @PostMapping("del")
     R del(@RequestBody @Validated UserInfoDto.DelDto dto);
+
+    /**
+     * 修改支付宝信息
+     * @param dto
+     * @return
+     */
+
+    @PostMapping("updateByAli")
+    R updateByAli(@RequestBody @Validated UserInfoDto.UpdateByAli dto);
+
+    /**
+     * 修改微信信息
+     * @param dto
+     * @return
+     */
+    @PostMapping("updateByWechat")
+    R updateByWechat(@RequestBody @Validated UserInfoDto.UpdateByWechat dto);
 }

sys-start/src/main/resources/bootstrap.yml

@@ -20,4 +20,4 @@ cloud:
         - satoken
 
 mysql:
-  doc: false
+  doc: false