swagger mysql

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

@@ -119,4 +119,13 @@ public class ActivityInstanceController extends BaseController {
             return fail();
         }
     }
+
+    @ApiOperation("删除活动")
+    @GetMapping("/code/list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "活动id", dataType = "int", paramType = "form"),
+    })
+    public Map<String, Object> codeList(){
+        return data(null);
+    }
 }

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

@@ -1,11 +1,24 @@
 package com.kiisoo.ic.activity.controller;
 
 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.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -17,13 +30,69 @@ import java.util.Map;
 @Slf4j
 public class WebAppActivityController extends BaseController {
 
+    @Autowired
+    private PoiStoreStaffDOMapper poiStoreStaffDOMapper;
+
+    @Autowired
+    private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper;
+
+    @Autowired
+    private PrivilageCpUserDOMapper privilageCpUserDOMapper;
+
+    @Autowired
+    private StoreEmployeeService storeEmployeeService;
+
+    @Autowired
+    private WebAppService webAppService;
+
+    /**
+     * 用户 mapper
+     */
+    @Autowired
+    private PrivilageUserDOMapper privilageUserDOMapper;
+
+    /**
+     * 角色 mapper
+     */
+    @Autowired
+    private PrivilageRoleDOMapper privilageRoleDOMapper;
+
+    /**
+     * 账号service
+     */
+    @Autowired
+    private PrivilageAccountService privilageAccountService;
+
     @ApiOperation(value = "我的活动推广列表")
     @GetMapping("/get/promotions")
     public Map<String, Object> myPromotions(long userId) {
         // TODO 查询当前小程序用户，在活动有效期间的有效活动，包含活动名称，活动二维码
         // TODO 从 promotion_src 获取当前导购的推广关系，并关联 activity_instance等表获取活动详情（注意活动有效性）
         // TODO 需要附加这个活动已经推广的客户列表 promotion_friends_src
-        return data(null);
+        try {
+            List<StafferInfoVO> info = poiStoreStaffDOMapper.selectInfoById(userId);
+            if(info.size() > 0){
+                PrivilageUserDO privilageUserDO = privilageUserDOMapper.selectById(userId);
+                // 用户不存在
+                if(null == privilageUserDO){
+                    return fail(com.kiisoo.ic.constants.Constants.ERROR_USER_NO_PERMISSION);
+                }
+                PrivilageAccountDO result = privilageAccountService.getAccountByUserId(userId);
+                // 该账号已暂停，请联系店长
+                if(null != result && result.getStatus().equals(2)){
+                    return fail(com.kiisoo.ic.constants.Constants.ERROR_ACCOUNT_STOP);
+                }
+                PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(userId);
+                Long storeId = privilageUserDOMapper.selectStoreIdByUserId(userId);
+                return data(info.get(0));
+            }else {
+                // 用户不存在
+                return fail("0009");
+            }
+        }catch (Exception e){
+            log.error("获取用户信息异常",e);
+            return fail();
+        }
     }
 
     @ApiOperation(value = "我的活动推广列表")

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java

@@ -128,10 +128,12 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
             pmnActivityStoreRelation.setCreateTime(new Date());
             pmnActivityStoreRelation.setStatus(pmnActivityInstance.getStatus().intValue());
             pmnActivityStoreRelation.setCaseId(pmnActivityPromotionCase.getId());
-            storeIds.add(store.getId());
             pmnActivityStoreRelationService.saveOrUpdate(pmnActivityStoreRelation, Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityStoreRelation::getStoreId, store.getId()));
+            storeIds.add(store.getId());
+        }
+        if(storeIds.size() > 0) {
+            pmnActivityStoreRelationService.remove(Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds));
         }
-        pmnActivityStoreRelationService.remove(Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds));
         return saveInstance && saveCase;
     }
 

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java

@@ -102,13 +102,15 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl<PmnActivitySched
             for (PmnActivityPromotionParam param : activityScheduleVO.getParams()) {
                 param.setPromotionId(pmnActivityPromotion.getId());
                 param.setAttr(2);
+                boolean saveParam = pmnActivityPromotionParamService.saveOrUpdate(param);
                 if(param.getId() != null && param.getId() > 0) {
                     paramIds.add(param.getId());
                 }
-                boolean saveParam = pmnActivityPromotionParamService.saveOrUpdate(param);
                 if (!saveParam) throw new RuntimeException("活动类型保存失败");
             }
-            pmnActivityPromotionParamService.remove(Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).notIn(PmnActivityPromotionParam::getId, paramIds).eq(PmnActivityPromotionParam::getAttr, 2));
+            if(paramIds.size() > 0) {
+                pmnActivityPromotionParamService.remove(Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).notIn(PmnActivityPromotionParam::getId, paramIds).eq(PmnActivityPromotionParam::getAttr, 2));
+            }
         }
         return saveActivitySchedule && saveActivityPromotion && saveAppId && saveUri;
     }