Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!434

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -11,6 +11,7 @@ import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.admin.domain.GoodsTagRel;
 import com.qs.mp.admin.domain.param.GoodsParam;
 import com.qs.mp.admin.domain.param.GoodsQueryParam;
+import com.qs.mp.admin.domain.param.GoodsUpdateSortWeightParam;
 import com.qs.mp.admin.domain.vo.GoodsVO;
 import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IGoodsSkuService;
@@ -131,16 +132,12 @@ public class GoodsMgrController extends BaseApiController {
   @PostMapping("/update/sortWeight")
   @PreAuthorize("@ss.hasPermi('business:goods:edit')")
   @ApiOperation("更新商品排序权重")
-  @ApiImplicitParams({
-          @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, dataType = "Long", paramType = "query"),
-          @ApiImplicitParam(name = "sortWeight", value = "排序权重", required = true, dataType = "Integer", paramType = "query")
-  })
-  public AjaxResult updateSortWeight(@RequestParam Long goodsId,
-                                     @RequestParam Integer sortWeight) {
+
+  public AjaxResult updateSortWeight(@RequestBody GoodsUpdateSortWeightParam param) {
 
     Goods goods = new Goods();
-    goods.setGoodsId(goodsId);
-    goods.setSortWeight(sortWeight);
+    goods.setGoodsId(param.getGoodsId());
+    goods.setSortWeight(param.getSortWeight());
     return AjaxResult.success(goodsService.updateById(goods));
   }
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -10,6 +10,7 @@ import com.qs.mp.admin.domain.excel.TicketExcel;
 import com.qs.mp.admin.domain.param.BathIdParam;
 import com.qs.mp.admin.domain.param.TicketBoxCreateParam;
 import com.qs.mp.admin.domain.param.TicketBoxParam;
+import com.qs.mp.admin.domain.param.TicketUpdateSortWeightParam;
 import com.qs.mp.admin.domain.vo.TicketAwardsVO;
 import com.qs.mp.admin.domain.vo.TicketBoxVO;
 import com.qs.mp.admin.service.ITicketAwardsPrizeService;
@@ -124,16 +125,11 @@ public class TicketBoxMgrController extends BaseApiController {
 	@PostMapping("/update/sortWeight")
 	@PreAuthorize("@ss.hasPermi('business:ticket:edit')")
 	@ApiOperation("更新盲票排序权重")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "boxId", value = "盲票组ID", required = true, dataType = "String", paramType = "query"),
-			@ApiImplicitParam(name = "sortWeight", value = "排序权重", required = true, dataType = "Integer", paramType = "query")
-	})
-	public AjaxResult updateSortWeight(@RequestParam String boxId,
-									   @RequestParam Integer sortWeight) {
+	public AjaxResult updateSortWeight(@RequestBody TicketUpdateSortWeightParam param) {
 
 		TicketBox ticketBox = new TicketBox();
-		ticketBox.setBoxId(boxId);
-		ticketBox.setSortWeight(sortWeight);
+		ticketBox.setBoxId(param.getBoxId());
+		ticketBox.setSortWeight(param.getSortWeight());
 		return AjaxResult.success(ticketBoxService.updateById(ticketBox));
 	}
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelController.java

@@ -25,9 +25,12 @@ import com.qs.mp.common.enums.ChannelRoleEnum;
 import com.qs.mp.common.enums.ChannelVerifyStatusEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.exception.base.BaseException;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.system.service.ISysUserService;
+import com.qs.mp.user.domain.UserAddr;
 import com.qs.mp.user.domain.UserTicketOrder;
+import com.qs.mp.user.service.IUserAddrService;
 import com.qs.mp.user.service.IUserTicketOrderService;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
@@ -87,6 +90,9 @@ public class ChannelController extends BaseApiController {
 	@Autowired
 	private MapperFacade mapperFacade;
 
+	@Autowired
+	private IUserAddrService userAddrService;
+
 	/**
 	 * 获取我的下级渠道列表信息，支持翻页
 	 *
@@ -590,7 +596,7 @@ public class ChannelController extends BaseApiController {
 			}else {
 				channel.setCertifyStatus(ChannelCertifyStatusEnum.NOT_CERTIFIED);
 			}
-			channelService.updateById(channel);
+			channelService.siteVerify(channel);
 		} catch (Exception e) {
 			return AjaxResult.error("门店'" + channel.getName() + "'认证审核失败");
 		}

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserExchangeController.java

@@ -127,6 +127,9 @@ public class UserExchangeController extends BaseApiController {
    */
   @PostMapping("/goods/detail")
   @ApiOperation(value = "查看商品详情", notes = "根据商品ID，获取商品信息")
+  @ApiResponses(
+          @ApiResponse(code = 200, message = "success" , response = GoodsVO.class)
+  )
   public AjaxResult getInfo(@RequestBody Goods param) {
     if (null == param.getGoodsId() || 0 == param.getGoodsId()) {
       return AjaxResult.error("参数异常，商品ID缺失");

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsUpdateSortWeightParam.java

@@ -0,0 +1,23 @@
+package com.qs.mp.admin.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 商品排序权重更新入参类
+ * @author Cup
+ * @date 2022/4/26
+ */
+@ApiModel("商品排序权重更新入参类")
+@Data
+public class GoodsUpdateSortWeightParam {
+
+
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    @ApiModelProperty("权重值")
+    private Integer sortWeight;
+}

mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketUpdateSortWeightParam.java

@@ -0,0 +1,22 @@
+package com.qs.mp.admin.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 盲票排序权重更新入参类
+ * @author Cup
+ * @date 2022/4/26
+ */
+@ApiModel("盲票排序权重更新入参类")
+@Data
+public class TicketUpdateSortWeightParam {
+
+
+    @ApiModelProperty("盲票组id")
+    private String boxId;
+
+    @ApiModelProperty("权重值")
+    private Integer sortWeight;
+}

mp-service/src/main/java/com/qs/mp/channel/service/IChannelService.java

@@ -110,4 +110,10 @@ public interface IChannelService extends IService<Channel> {
     */
 	List<IndexVO> selectIndexSiteIncreaseList(Wrapper<Channel> wrapper);
 
+	/**
+	 * 审核通过的经销商
+	 * @param channel
+	 * @return
+	 */
+    boolean siteVerify(Channel channel);
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java

@@ -20,6 +20,8 @@ import com.qs.mp.system.domain.SysRole;
 import com.qs.mp.system.domain.SysUser;
 import com.qs.mp.system.service.ISysRoleService;
 import com.qs.mp.system.service.ISysUserService;
+import com.qs.mp.user.domain.UserAddr;
+import com.qs.mp.user.service.IUserAddrService;
 import com.qs.mp.utils.SecurityUtils;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +56,9 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
   @Autowired
   private ISysRoleService roleService;
 
+  @Autowired
+  private IUserAddrService userAddrService;
+
   @Override
   @Transactional
   public void saveChannel(Channel channel, ChannelRoleEnum channelRole) {
@@ -187,4 +192,32 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
 	 return getBaseMapper().selectIndexSiteIncreaseList(wrapper);
   }
 
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public boolean siteVerify(Channel channel) {
+
+    // 更新经销商信息
+    channelService.updateById(channel);
+
+    // 设置保存地址信息
+    UserAddr userAddr = new UserAddr();
+    userAddr.setUserId(channel.getUserId());
+    userAddr.setReceiver(channel.getContact());
+    userAddr.setProvince(channel.getProvince());
+    userAddr.setProvinceId(channel.getProvinceId());
+    userAddr.setCity(channel.getCity());
+    userAddr.setCityId(channel.getCityId());
+    userAddr.setArea(channel.getArea());
+    userAddr.setAreaId(channel.getAreaId());
+    userAddr.setAddr(channel.getAddress());
+    userAddr.setMobile(channel.getMobile());
+    userAddr.setStatus(1);
+    int count = userAddrService.count(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, channel.getUserId()));
+    if (count == 0) {
+      userAddr.setCommonAddr(1);
+    }
+    userAddrService.save(userAddr);
+
+    return true;
+  }
 }

mp-service/src/main/java/com/qs/mp/user/domain/UserAddr.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -16,6 +19,7 @@ import lombok.Data;
  */
 @TableName("mp_user_addr")
 @Data
+@ApiModel("用户配送地址实体类")
 public class UserAddr implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -23,96 +27,112 @@ public class UserAddr implements Serializable {
   /**
    * ID
    */
+  @ApiModelProperty("地址id,主键")
   @TableId(value = "addr_id" , type = IdType.AUTO)
   private Long addrId;
 
   /**
-   * 渠道ID
+   * 用户ID
    */
+  @ApiModelProperty("用户id")
   @TableField("user_id")
   private Long userId;
 
   /**
    * 收货人
    */
+  @ApiModelProperty("收货人")
   @TableField("receiver")
   private String receiver;
 
   /**
    * 省ID
    */
+  @ApiModelProperty("省id")
   @TableField("province_id")
   private Long provinceId;
 
   /**
    * 省
    */
+  @ApiModelProperty("省")
   @TableField("province")
   private String province;
 
   /**
    * 城市
    */
+  @ApiModelProperty("城市")
   @TableField("city")
   private String city;
 
   /**
    * 城市ID
    */
+  @ApiModelProperty("城市id")
   @TableField("city_id")
   private Long cityId;
 
   /**
    * 区
    */
+  @ApiModelProperty("区")
   @TableField("area")
   private String area;
 
   /**
    * 区ID
    */
+  @ApiModelProperty("区id")
   @TableField("area_id")
   private Long areaId;
 
   /**
    * 邮编
    */
+  @ApiModelProperty("邮编")
   @TableField("post_code")
   private String postCode;
 
   /**
    * 地址
    */
+  @ApiModelProperty("地址")
   @TableField("addr")
   private String addr;
 
   /**
    * 手机
    */
+  @ApiModelProperty("手机")
   @TableField("mobile")
   private String mobile;
 
   /**
    * 状态,1正常，0无效
    */
+  @ApiModelProperty("状态,1正常，0无效")
   @TableField("status")
   private Integer status;
 
   /**
    * 是否默认地址 1是
    */
+  @ApiModelProperty("是否默认地址 1是")
   @TableField("common_addr")
   private Integer commonAddr;
 
   /**
    * 建立时间
    */
+  @ApiModelProperty("建立时间")
   @TableField("create_time")
   private Date createTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @Version
   @TableField("update_time")
   private Date updateTime;

mp-service/src/main/java/com/qs/mp/user/service/IUserAddrService.java

@@ -12,11 +12,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-03-02
  */
 public interface IUserAddrService extends IService<UserAddr> {
-  UserAddr getDefaultChannelAddr(Long channelId);
+  UserAddr getDefaultChannelAddr(Long userId);
 
-  boolean updateDefaultChannelAddr(Long addrId, Long channelId);
+  boolean updateDefaultChannelAddr(Long addrId, Long userId);
 
-  boolean removeChannelAddrByUserId(Long addrId, Long channelId);
+  boolean removeChannelAddrByUserId(Long addrId, Long userId);
 
-  UserAddr getChannelAddrByUserId(Long addrId, Long channelId);
+  UserAddr getChannelAddrByUserId(Long addrId, Long userId);
 }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserAddrServiceImpl.java

@@ -6,8 +6,10 @@ import com.qs.mp.user.domain.UserAddr;
 import com.qs.mp.user.mapper.UserAddrMapper;
 import com.qs.mp.user.service.IUserAddrService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 /**
  * <p>
@@ -22,29 +24,34 @@ public class UserAddrServiceImpl extends ServiceImpl<UserAddrMapper, UserAddr> i
     IUserAddrService {
 
   @Override
-  public UserAddr getDefaultChannelAddr(Long channelId) {
-    return getOne(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, channelId)
+  public UserAddr getDefaultChannelAddr(Long userId) {
+    List<UserAddr> userAddrList = list(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId,
+            userId)
         .eq(UserAddr::getCommonAddr, 1));
+    if (CollectionUtils.isEmpty(userAddrList)) {
+      return null;
+    }
+    return userAddrList.get(0);
   }
 
   @Override
   @Transactional
-  public boolean updateDefaultChannelAddr(Long addrId, Long channelId) {
+  public boolean updateDefaultChannelAddr(Long addrId, Long userId) {
     update(new LambdaUpdateWrapper<UserAddr>().set(UserAddr::getCommonAddr, 0)
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getCommonAddr, 1));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getCommonAddr, 1));
     return update(new LambdaUpdateWrapper<UserAddr>().set(UserAddr::getCommonAddr, 1)
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getAddrId, addrId));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getAddrId, addrId));
   }
 
   @Override
-  public boolean removeChannelAddrByUserId(Long addrId, Long channelId) {
+  public boolean removeChannelAddrByUserId(Long addrId, Long userId) {
     return remove(new LambdaQueryWrapper<UserAddr>()
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getAddrId, addrId));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getAddrId, addrId));
   }
 
   @Override
-  public UserAddr getChannelAddrByUserId(Long addrId, Long channelId) {
+  public UserAddr getChannelAddrByUserId(Long addrId, Long userId) {
     return getOne(new LambdaQueryWrapper<UserAddr>()
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getAddrId, addrId));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getAddrId, addrId));
   }
 }