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

Dev

See merge request quanshu/mp-server!789

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

@@ -3,6 +3,7 @@ package com.qs.mp.web.controller.api.admin;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.mp.admin.domain.excel.ChannelExcel;
 import com.qs.mp.admin.domain.excel.UserTicketOrderItemExcel;
 import com.qs.mp.admin.domain.vo.TicketCntVO;
@@ -12,6 +13,7 @@ import com.qs.mp.channel.domain.ChannelOrder;
 import com.qs.mp.channel.domain.ChannelOrderDetail;
 import com.qs.mp.channel.domain.ChannelUserRel;
 import com.qs.mp.channel.domain.param.ChannelParam;
+import com.qs.mp.channel.domain.param.SaleSiteEditParam;
 import com.qs.mp.channel.domain.param.SaleSiteParam;
 import com.qs.mp.channel.domain.vo.ChannelOperDataVO;
 import com.qs.mp.channel.domain.vo.ChannelVO;
@@ -322,6 +324,27 @@ public class SaleSiteMgrController extends BaseApiController {
 		return AjaxResult.success("经销商'" + channel.getName() + "'新增成功");
 	}
 
+	@PreAuthorize("@ss.hasPermi('business:salesite:edit')")
+	@ApiOperation("修改门店信息")
+	@PostMapping("/edit")
+	public AjaxResult edit(@RequestBody SaleSiteEditParam saleSiteEditParam){
+		Channel channel = channelService.getById(saleSiteEditParam.getChannelId());
+		if (channel == null) {
+			return AjaxResult.error("门店信息不存在");
+		}
+
+		boolean rtn = channelService.update(new LambdaUpdateWrapper<Channel>()
+			.set(Channel::getSiteName, saleSiteEditParam.getSiteName())
+			.eq(Channel::getChannelId, saleSiteEditParam.getChannelId()));
+
+		if (!rtn) {
+			return AjaxResult.error("更新门店信息失败");
+		}
+
+		return AjaxResult.success();
+	}
+
+
 	/**
 	 * 编辑经销商信息
 	 * @param

mp-service/src/main/java/com/qs/mp/admin/service/impl/MarketingServiceImpl.java

@@ -402,31 +402,6 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         redisCache.deleteObject(userLowLotteryPool);
         redisCache.deleteObject(insideLotteryPool);
 
-
-
-        // 保存开奖消息
-        // 获取所有的参与用户的用户id去重
-        List<MarketingUserCode> sendMsgUserList = marketingUserCodeService.list(new LambdaQueryWrapper<MarketingUserCode>()
-            .select(MarketingUserCode::getUserId)
-            .eq(MarketingUserCode::getMarketingId, marketing.getId())
-            .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
-            .groupBy(MarketingUserCode::getUserId));
-        if (CollectionUtils.isEmpty(sendMsgUserList)) {
-            return;
-        }
-        List<MarketingMsg> marketingMsgList = new ArrayList<>();
-        for (MarketingUserCode marketingUserCode : sendMsgUserList) {
-            // 封装开奖订阅消息
-            MarketingMsg marketingMsg = new MarketingMsg();
-            marketingMsg.setType(1);
-            marketingMsg.setMarketingId(marketing.getId());
-            marketingMsg.setContext(marketing.getTitle());
-            marketingMsg.setUserId(marketingUserCode.getUserId());
-            marketingMsgList.add(marketingMsg);
-        }
-        rtn = marketingMsgService.saveBatch(marketingMsgList);
-        Assert.isTrue(rtn, "保存活动开奖消息失败。marketingId:" + marketing.getId());
-
     }
 
     private MarketingHitPrize exchangeMarketingHitPrize(Marketing marketing, List<MarketingHitPrize> allHitPrizeList, MarketingAwards marketingAwards, List<MarketingAwardsPrize> marketingAwardsPrizeList, MarketingUserCode marketingUserCode) {

mp-service/src/main/java/com/qs/mp/channel/domain/param/SaleSiteEditParam.java

@@ -0,0 +1,27 @@
+package com.qs.mp.channel.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 门店编辑入参类
+ * @author Cup
+ * @date 2022/7/4
+ */
+@ApiModel("门店编辑入参类")
+@Data
+public class SaleSiteEditParam {
+
+
+    @NotNull(message = "门店id不能为空")
+    @ApiModelProperty("门店id")
+    private Long channelId;
+
+    @NotBlank(message = "门店名称不能为空")
+    @ApiModelProperty("门店名称")
+    private String siteName;
+
+}