Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into dev

# Conflicts:
#	src/main/resources/application-test.yml

src/main/java/com/kiisoo/ic/activity/bean/WelcomeVO.java

@@ -0,0 +1,46 @@
+package com.kiisoo.ic.activity.bean;
+
+import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
+import com.kiisoo.ic.store.entity.PoiStore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+@ApiModel("欢迎语")
+@Data
+public class WelcomeVO {
+
+    @ApiModelProperty(value = "欢迎语ID，有就编辑无则新增，欢迎语就是活动实例的一种，category_code = welcome")
+    private Long id;
+
+    @ApiModelProperty(value = "活动池ID", required = true)
+    @NotNull(message = "请输入活动池ID")
+    private Long scheduleId;
+
+    @ApiModelProperty(value = "欢迎语内容")
+    private String content;
+
+    @ApiModelProperty(value = "欢迎语类型，有三种，分别是图片/image，网页/link和小程序/miniprogram", required = true)
+    private String type;
+
+    @ApiModelProperty(value = "如果是小程序，则必填APPID")
+    private String appId;
+
+    @ApiModelProperty(value = "如果是小程序或者网页，必填网页地址，如果是图片，则这里放图片路径", required = true)
+    private String url;
+
+    @ApiModelProperty(value = "选择的企业列表", required = true)
+//    @NotNull(message = "请选择企业列表")
+//    @Size(min = 1, message = "请选择企业列表")
+    private List<PrivilageOrganizational> organizations;
+
+    @ApiModelProperty(value = "选择的店铺列表", required = true)
+    @NotNull(message = "请选择店铺列表")
+    @Size(min = 1, message = "请选择店铺列表")
+    private List<PoiStore> stores; // 店铺列表
+}

src/main/java/com/kiisoo/ic/activity/controller/FissionController.java

@@ -0,0 +1,15 @@
+package com.kiisoo.ic.activity.controller;
+
+import com.kiisoo.ic.common.BaseController;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(value = "后台-裂变", tags = {"后台-裂变"})
+@RequestMapping(value = "/welcome")
+@Slf4j
+public class FissionController extends BaseController {
+
+}

src/main/java/com/kiisoo/ic/activity/controller/WebAppActivityController.java

@@ -1,31 +1,15 @@
 package com.kiisoo.ic.activity.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.kiisoo.ic.activity.bean.ActivityInstanceVO;
 import com.kiisoo.ic.activity.bean.PromotionSrcVO;
 import com.kiisoo.ic.activity.bean.PushPromotionsVO;
 import com.kiisoo.ic.activity.bean.RemoveStaffVO;
-import com.kiisoo.ic.activity.entity.PmnActivityInstance;
-import com.kiisoo.ic.activity.entity.PmnPromotionFriendsSrc;
 import com.kiisoo.ic.activity.entity.PmnPromotionSrc;
-import com.kiisoo.ic.activity.service.IPmnActivityInstanceService;
-import com.kiisoo.ic.activity.service.IPmnPromotionFriendsSrcService;
 import com.kiisoo.ic.activity.service.IPmnPromotionSrcService;
 import com.kiisoo.ic.common.BaseController;
-import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper;
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
 import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
-import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper;
-import com.kiisoo.ic.store.service.StoreEmployeeService;
 import com.kiisoo.ic.synchronous.entity.TurnBackDTO;
-import com.kiisoo.ic.system.entity.PrivilageAccountDO;
-import com.kiisoo.ic.system.entity.PrivilageRoleDO;
-import com.kiisoo.ic.system.entity.PrivilageUserDO;
-import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper;
-import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper;
-import com.kiisoo.ic.system.service.PrivilageAccountService;
-import com.kiisoo.ic.webappmy.service.WebAppService;
-import com.kiisoo.ic.webappmy.vo.StafferInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/kiisoo/ic/activity/controller/WelcomeController.java

@@ -0,0 +1,42 @@
+package com.kiisoo.ic.activity.controller;
+
+import com.kiisoo.ic.activity.bean.WelcomeVO;
+import com.kiisoo.ic.common.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@Api(value = "后台-欢迎语", tags = {"后台-欢迎语"})
+@RequestMapping(value = "/welcome")
+@Slf4j
+public class WelcomeController extends BaseController {
+
+    @ApiOperation(value = "欢迎语列表")
+    @GetMapping("/list")
+    public Map<String, Object> list() {
+        return data(null);
+    }
+
+    @ApiOperation(value = "欢迎语详情")
+    @GetMapping("/detail")
+    public Map<String, Object> detail() {
+        return data(null);
+    }
+
+    @ApiOperation(value = "欢迎语修改/保存")
+    @PostMapping("/save")
+    public Map<String, Object> save(@RequestBody WelcomeVO welcomeVO) {
+        // TODO 先创建schedule，再创建case，再创建instance（三者都是一对一关系，category_code = welcome），并保存相关参数，关联店铺
+        return data(null);
+    }
+
+    @ApiOperation(value = "欢迎语删除")
+    @PostMapping("/delete")
+    public Map<String, Object> delete() {
+        return data(null);
+    }
+}