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

Dev

See merge request quanshu/mp-server!66

mp-common/src/main/java/com/qs/mp/common/enums/CouponTypeEnum.java

@@ -4,15 +4,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IEnum;
 
 /**
+ * 优惠券类型（按使用场景划分）
  * @auther zhongcp
  * @create 2022 2022/3/7 2:30 下午
  * @describe
  */
 public enum CouponTypeEnum implements IEnum<Integer> {
 
-  TICKET_ORDER(1, "用户盲票购买优惠券"),
-  SITE_CONSUME(2, "用户门店消费优惠券"),
-  CHANNEL(3, "经销商盲票采购优惠券");
+  TICKET_ORDER(1, "盲票购买"),
+  SITE_CONSUME(2, "门店消费"),
+  CHANNEL(3, "经销商采购");
 
 
   private final int value;

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

@@ -0,0 +1,15 @@
+package com.qs.mp.admin.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author zhongcp
+ * @Date 2022/3/11
+ */
+@ApiModel(value= "盲票组奖级参数")
+@Data
+public class TicketAwardsParam {
+  List<TicketAwardsPrizeParam> prizeList;
+}

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

@@ -0,0 +1,14 @@
+package com.qs.mp.admin.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author zhongcp
+ * @Date 2022/3/11
+ */
+@ApiModel(value= "盲票组奖级对应的奖品参数")
+@Data
+public class TicketAwardsPrizeParam {
+
+}

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

@@ -1,5 +1,6 @@
 package com.qs.mp.admin.service.impl;
 
+import com.qs.mp.admin.domain.CouponTicket;
 import com.qs.mp.admin.domain.Goods;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.admin.mapper.GoodsMapper;
@@ -7,6 +8,7 @@ import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IGoodsSkuService;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.system.service.id.BizIdGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.List;
@@ -73,10 +75,20 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 				}
 			}
 			// TODO 未完待续
-			boolean skuRes = goodsSkuService.saveBatch(skuList);
-			if(!skuRes) {
+			LambdaQueryWrapper<GoodsSku> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(GoodsSku::getGoodsId, goods.getGoodsId());
+			boolean delRes = goodsSkuService.remove(queryWrapper);
+			if(delRes) {
+				boolean skuRes = goodsSkuService.saveBatch(skuList);
+				if(!skuRes) {
+					throw new ServiceException("请联系管理员");
+				}
+			}else {
 				throw new ServiceException("请联系管理员");
 			}
+			
+			
+	
 		}
 	}
 }

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

@@ -106,8 +106,8 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
 			 sysUser.setDeptId(SecurityUtils.getDeptId());
 			 int userNum = userService.updateUser(sysUser);
 			 if (userNum == 0 || null == sysUser.getUserId()) {
-		        throw new ServiceException("更新失败，请联系管理员");
-		      }
+		       throw new ServiceException("更新失败，请联系管理员");
+		     }
 			 // 发送账号更新成功短信
 		 }
 	}