Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/UserAccountSimpleDTO.java

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -57,4 +58,6 @@ public class UserAccountSimpleDTO implements Serializable {
     private String briefIntroduction;
     @ApiModelProperty(value = "封面背景图")
     private String coverPicture;
+    @ApiModelProperty(value = "是否是飞手")
+    private int isPilot;
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: eb176df27fc381eb75bb67e9b75eb9256356da88
+  newTag: 58017101155be76561a40b3214c17bb51dd3fb8b

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

@@ -12,6 +12,7 @@ import com.mmc.csf.release.feign.hystrix.UserAppApiHystrix;
 import com.mmc.csf.release.flyer.vo.CurriculumOrderLogVO;
 import com.mmc.csf.user.vo.ChangeUserPointVO;
 import com.mmc.csf.user.vo.WxMsgVO;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -83,27 +84,35 @@ public interface UserAppApi {
     @PostMapping("/userapp/userPoint/change")
     public ResultBody changeUserPoint(@RequestBody ChangeUserPointVO changePoint, @RequestHeader("token") String token);
 
+    //查询团队里面的飞手id
     @GetMapping("/userapp/pilot/selectPilotIdList")
     List<Integer> feignGetPilotIdList(@RequestHeader("token") String token);
 
+    //获取用户的基本信息
     @GetMapping("/userapp/user-account/feignGetUserBaseInfo")
     UserBaseInfoDTO feignGetUserBaseInfo(@RequestParam Integer userAccountId);
 
+    //修改用户积分
     @GetMapping("/userapp/userPoint/feignChangeUserPoints")
     ResultBody feignChangeUserPoints(@RequestHeader("token") String token,@RequestHeader HttpServletRequest request, @RequestParam("id") int changePoint,@RequestParam("reason") String reason);
 
+    //课程订单钱包流水记录
     @PostMapping("/userapp/pay/feignCurriculumOrderLog")
     ResultBody feignCurriculumOrderLog(@RequestHeader("token") String token,@RequestHeader HttpServletRequest request,@RequestBody CurriculumOrderLogVO curriculumOrderLogVO);
 
+    //发送消息
     @PostMapping("/userapp/wx/send")
     ResultBody feignSendWxMsg(@RequestHeader("token") String token,@RequestBody WxMsgVO ws);
 
+    //查询飞手的团队管理员的ID
     @GetMapping("/userapp/pilot/selectPilotTeamManagerId")
     Integer selectPilotTeamManagerId(@RequestHeader("token") String token,@RequestParam Integer pilotUserId);
 
+    //查询飞手的手机号
     @GetMapping("/userapp/pilot/getPilotApplyPhone")
     String getPilotApplyPhone(@RequestHeader("token") String token,@RequestParam Integer userAccountId);
 
+    //修改用户的积分
     @GetMapping("/userapp/userPoint/changeUserPoints")
     ResultBody changeUserPoints(@RequestHeader("token") String token,@RequestHeader HttpServletRequest request, @RequestParam("id") Integer id);
 }