问题修改

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/UserSetReq.java

@@ -15,6 +15,8 @@ import java.util.Date;
  */
 @ApiModel(value = "UserSetReq对象", description = "用户设置请求对象")
 public class UserSetReq {
+    @ApiModelProperty(value = "客户端",required = true)
+    private String clientId;
     @ApiModelProperty("头像地址")
     private String avatar;
     @ApiModelProperty("昵称")
@@ -27,6 +29,14 @@ public class UserSetReq {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date birthdate;
 
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
     public String getAvatar() {
         return avatar;
     }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.auth.web.controller;
 
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
+import com.yonge.cooleshow.common.enums.SysUserType;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -569,14 +570,18 @@ public class UserController extends BaseController {
         if (authUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        setReq.setClientId(authUser.getClientId());
+
         SysUser user = sysUserService.get(authUser.getUserId());
         if (user == null || null == user.getId()) {
             return failed("用户不存在");
         }
 
-        //判断用户昵称修改时间
-        if (StringUtils.isNotEmpty(setReq.getUsername())) {
-            checkLastUsernameTime(user, setReq.getUsername());
+        if (SysUserType.TEACHER.getCode().equals(authUser.getClientId())) {
+            //判断用户昵称修改时间
+            if (StringUtils.isNotEmpty(setReq.getUsername())) {
+                checkLastUsernameTime(user, setReq.getUsername());
+            }
         }
 
         //设置

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -255,7 +255,10 @@
             avatar_ = #{param.avatar},
         </if>
         <if test="param.username != null and param.username != ''">
-            username_ = #{param.username},last_username_time_ = now(),
+            username_ = #{param.username},
+            <if test="param.clientId != null and param.clientId == 'TEACHER'">
+                last_username_time_ = now(),
+            </if>
         </if>
         <if test="param.gender != null">
             gender_ = #{param.gender},

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.vo.ActivityRewardChangeStockVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
@@ -78,6 +79,7 @@ public class ActivityRewardController extends BaseController {
     @ApiOperation(value = "查询列表", notes = "传入activityRewardSearch")
     @PreAuthorize("@pcs.hasPermissions('activityReward/list')")
     public HttpResponseResult<List<ActivityRewardVo>> list(@RequestBody ActivityRewardSearch query) {
+        query.setHasStock(YesOrNoEnum.YES);
         List<ActivityRewardVo> list = activityRewardService.selectAll(query);
         return succeed(list);
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRewardChangeStockSearch.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.toolset.base.page.QueryInfo;
@@ -8,7 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,6 +20,9 @@ public class ActivityRewardChangeStockSearch extends QueryInfo{
 	@ApiModelProperty(value = "变更来源：ADMIN 后台调整 ACTIVITY 活动分配 ",hidden = true)
 	private String source;
 
+	@ApiModelProperty(value = "奖品id ")
+	private Long rewardId;
+
 	@ApiModelProperty("调整类型： IN 增加 OUT 减少 ")
 	private InOrOutEnum changeType;
 
@@ -38,6 +39,13 @@ public class ActivityRewardChangeStockSearch extends QueryInfo{
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date endTime;
 
+	public Long getRewardId() {
+		return rewardId;
+	}
+
+	public void setRewardId(Long rewardId) {
+		this.rewardId = rewardId;
+	}
 
 	public InOrOutEnum getChangeType() {
 		return changeType;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRewardSearch.java

@@ -24,7 +24,7 @@ public class ActivityRewardSearch extends QueryInfo{
 	private String rewardClient;
 
 	@ApiModelProperty("是否只查询有库存的数据 0 否 1 是")
-	private YesOrNoEnum hasStock = YesOrNoEnum.YES;
+	private YesOrNoEnum hasStock = YesOrNoEnum.NO;
 
 	public String getRewardName() {
 		return rewardName;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityPlanService.java

@@ -107,6 +107,4 @@ public interface ActivityPlanService extends IService<ActivityPlan>  {
 	 * @return
 	 */
     Boolean saveOrUpdateReward(List<ActivityPlanRewardDto> updateRewardDtoList);
-
-
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardChangeStockMapper.xml

@@ -36,6 +36,9 @@
         FROM activity_reward_change_stock t
         left join sys_user u on t.create_by_ = u.id_
         <where>
+            <if test="param.rewardId != null">
+                and t.reward_id_ = #{param.rewardId}
+            </if>
             <if test="param.source != null and param.source != ''">
                 and t.source_ = #{param.source}
             </if>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardMapper.xml

@@ -72,6 +72,7 @@
                 and t.stock_>0
             </if>
         </where>
+        order by t.create_time_ desc
     </sql>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo">