修改管理后台账号和共享session等 屏蔽除出租车外的其他模块

Pu Zhibing

3 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -60,23 +61,23 @@
                               Integer inviteCouponId, Integer inviteEnable, Integer inviteNumber, Integer inviteEffective, Integer balanceEnable, String balanceInfo,
                               Integer discountEnable, Double discountSpecial, Double discountTaxi, Double discountLogistics, Integer redenvelopeId, Integer redenvelopeEnable,
                               Double registerPrice, Double invitationPrice, Double redPrice) {
        if(id==null){
        if(id==null) {
            String[] timeArray = startTime.split(" - ");
            Date startTimes = DateUtil.getDate_str3(timeArray[0]);
            Date endTimes = DateUtil.getDate_str3(timeArray[1]);
            ShiroUser user = ShiroKit.getUser();
            ShiroUser user = ShiroExtUtil.getUser();
            Date nowDay = new Date();
            UserActivity userActivity = new UserActivity();
            userActivity.setInsertTime(nowDay);
            userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
            userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
            userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
            userActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            userActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            userActivity.setStatus(userActivity.getCompanyType() == 1 ? 3 : 1);
            userActivity.setName(name);
            userActivity.setStartTime(startTimes);
            userActivity.setEndTime(endTimes);
            userActivity.insertOrUpdate();
            //添加注册奖励
            if(registCouponId!=null){
            if (registCouponId != null) {
                UserActivityRegistered userActivityRegistered = new UserActivityRegistered();
                userActivityRegistered.setCouponId(registCouponId);
                userActivityRegistered.setEnable(registEnable);
@@ -164,27 +165,27 @@
                userActivityRedenvelope.setLavePrice(redPrice);
                userActivityRedenvelope.insertOrUpdate();
            }
        }else{
        }else {
            String[] timeArray = startTime.split(" - ");
            Date startTimes = DateUtil.getDate_str3(timeArray[0]);
            Date endTimes = DateUtil.getDate_str3(timeArray[1]);
            ShiroUser user = ShiroKit.getUser();
            ShiroUser user = ShiroExtUtil.getUser();
            Date nowDay = new Date();
            UserActivity userActivity = new UserActivity();
            userActivity.setId(id);
            userActivity.setInsertTime(nowDay);
            userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
            userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
            userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
            userActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            userActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            userActivity.setStatus(userActivity.getCompanyType() == 1 ? 3 : 1);
            userActivity.setName(name);
            userActivity.setStartTime(startTimes);
            userActivity.setEndTime(endTimes);
            userActivity.insertOrUpdate();
            userActivityBalanceService.delete(new EntityWrapper<UserActivityBalance>().eq("userActivityId",id));
            userActivityDiscount1Service.delete(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId",id));
            userActivityInviteService.delete(new EntityWrapper<UserActivityInvite>().eq("userActivityId",id));
            userActivityRedenvelopeService.delete(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId",id));
            userActivityRegisteredService.delete(new EntityWrapper<UserActivityRegistered>().eq("userActivityId",id));
            userActivityBalanceService.delete(new EntityWrapper<UserActivityBalance>().eq("userActivityId", id));
            userActivityDiscount1Service.delete(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId", id));
            userActivityInviteService.delete(new EntityWrapper<UserActivityInvite>().eq("userActivityId", id));
            userActivityRedenvelopeService.delete(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId", id));
            userActivityRegisteredService.delete(new EntityWrapper<UserActivityRegistered>().eq("userActivityId", id));
            //添加注册奖励
            if(registCouponId!=null){
                UserActivityRegistered userActivityRegistered = new UserActivityRegistered();