cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -297,7 +297,6 @@ @ResponseBody @PostMapping("/base/appUser/loginSMSCode") @ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"}) public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) { try { return appUserService.loginSMSCode(loginSMSCodeVo); cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -61,7 +61,7 @@ monthEnd = DateTimeHelper.getCurrentMouthEnd(); } List<UserIntegralChanges> userIntegralChanges = this.baseMapper.selectList(new QueryWrapper<UserIntegralChanges>() .eq("appUserId", userIdFormRedis) .eq("appUserId", userIdFormRedis).le("type", 5) .between("insertTime", monthStart, monthEnd) .orderByDesc("insertTime")); if (userIntegralChanges.size() > 0) { cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -1240,7 +1240,7 @@ public List<WorldCupUserListVo> userDetailsOfSearch(@RequestBody UserDetailsOfSearch search){ // 已报名的用户 List<WorldCupPaymentParticipant> list = worldCupPaymentParticipantService.list(new LambdaQueryWrapper<WorldCupPaymentParticipant>().eq(WorldCupPaymentParticipant::getWorldCupId, search.getId()) .eq(WorldCupPaymentParticipant::getAlreadyEntered, 0)); ); ArrayList<WorldCupUserListVo> worldCupUserListVos = new ArrayList<>(); if(list.size()>0){ List<Long> collect = list.stream().map(WorldCupPaymentParticipant::getParticipantId).collect(Collectors.toList()); cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
@@ -194,6 +194,7 @@ Integer winIntegral = Integer.valueOf(null == map.get("winIntegral") ? "0" : map.get("winIntegral").toString()); Integer drawIntegral = Integer.valueOf(null == map.get("drawIntegral") ? "0" : map.get("drawIntegral").toString()); Integer loseIntegral = Integer.valueOf(null == map.get("loseIntegral") ? "0" : map.get("loseIntegral").toString()); Integer participationIntegral = Integer.valueOf(null == map.get("participationIntegral") ? "0" : map.get("participationIntegral").toString()); //学员 if(participantType == 1){ TStudent tStudent = studentClient.queryById(participantId.intValue()); @@ -209,7 +210,7 @@ } } map.put("totalSession", num); map.put("totalIntegral", winIntegral+drawIntegral+loseIntegral); map.put("totalIntegral", winIntegral+drawIntegral+loseIntegral+participationIntegral); map.put("winRate", "0"); for (Map<String, Object> objectMap : lists1) { Integer participantType1 = Integer.valueOf(objectMap.get("participantType").toString()); @@ -1061,11 +1062,11 @@ ArrayList<UserVo> objects = new ArrayList<>(); for (WorldCupCompetitor competitor : collect1) { UserVo userVo = new UserVo(); AppUser appUser = appUserClient.getAppUser(competitor.getAppUserId()); userVo.setUserName(appUser.getName()); userVo.setAvatar(appUser.getHeadImg()); TStudent tStudent = studentClient.queryById(competitor.getParticipantId().intValue()); userVo.setUserName(tStudent.getName()); userVo.setAvatar(tStudent.getHeadImg()); // 当前日期和生日计算年龄 Date birthday = appUser.getBirthday(); Date birthday = tStudent.getBirthday(); if(birthday!=null){ int age = now.getYear() - birthday.getYear(); @@ -1079,11 +1080,11 @@ ArrayList<UserVo> objects1 = new ArrayList<>(); for (WorldCupCompetitor competitor : collect2) { UserVo userVo = new UserVo(); AppUser appUser = appUserClient.getAppUser(competitor.getAppUserId()); userVo.setUserName(appUser.getName()); userVo.setAvatar(appUser.getHeadImg()); TStudent tStudent = studentClient.queryById(competitor.getParticipantId().intValue()); userVo.setUserName(tStudent.getName()); userVo.setAvatar(tStudent.getHeadImg()); // 当前日期和生日计算年龄 Date birthday = appUser.getBirthday(); Date birthday = tStudent.getBirthday(); if(birthday!=null){ int age = now.getYear() - birthday.getYear(); cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml
@@ -111,9 +111,10 @@ participantId, appUserId, count(*) as num, winIntegral, drawIntegral, loseIntegral sum(winIntegral) as winIntegral, sum(drawIntegral) as drawIntegral, sum(loseIntegral) as loseIntegral, sum(participationIntegral) as participationIntegral from t_world_cup_competitor where matchResult is not null <if test="null != item.year"> cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/HomeModuleController.java
@@ -1,6 +1,7 @@ package com.dsh.guns.modular.system.controller.code; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dsh.guns.config.UserExt; import com.dsh.guns.core.util.ToolUtil; import com.dsh.guns.modular.system.model.HomeModule; @@ -8,6 +9,7 @@ import com.dsh.guns.modular.system.service.IStoreService; import com.dsh.guns.modular.system.util.ImageUtils; import com.dsh.guns.modular.system.util.ResultUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -34,7 +36,10 @@ @RequestMapping("/tHomeModule_platformSet/{id}") public String tHomeModulePlatformSet(@PathVariable Integer id, Model model) { HomeModule data = homeModuleService.getById(id); HomeModule data = homeModuleService.getOne(new LambdaQueryWrapper<HomeModule>().eq(HomeModule::getStoreId, id)); if(data==null){ data =homeModuleService.getById(1); } List<Map<String, Object>> pages = storeService.typeChange(data.getModel()); List<Map<String, Object>> types = storeService.typeChangeOne(data.getJumpPage()); // type=1 查看详情 type=2 编辑 @@ -44,26 +49,50 @@ model.addAttribute("data",data); model.addAttribute("pages",pages); model.addAttribute("types",types); model.addAttribute("id",id); return PREFIX + "tHomeModule.html"; } @ResponseBody @RequestMapping("/updateHomeModule") public ResultUtil updateAdvertisement(@RequestBody HomeModule homeModule) { if (homeModule.getType().equals("请选择")){ homeModule.setType(null); } if (homeModule.getPage().equals("请选择")){ homeModule.setPage(null); } if (ToolUtil.isNotEmpty(homeModule.getBackgroundImage())) { try { homeModule.setDisplayType(ImageUtils.getImageDimensions(homeModule.getBackgroundImage()).getDisplayType()); } catch (IOException e) { throw new RuntimeException(e); HomeModule one = homeModuleService.getOne(new LambdaQueryWrapper<HomeModule>().eq(HomeModule::getStoreId, homeModule.getStoreId())); if(one==null){ one = new HomeModule(); BeanUtils.copyProperties(homeModule,one); one.setId(null); if (homeModule.getType().equals("请选择")){ one.setType(null); } if (homeModule.getPage().equals("请选择")){ one.setPage(null); } if (ToolUtil.isNotEmpty(homeModule.getBackgroundImage())) { try { one.setDisplayType(ImageUtils.getImageDimensions(homeModule.getBackgroundImage()).getDisplayType()); } catch (IOException e) { throw new RuntimeException(e); } } return ResultUtil.success(homeModuleService.saveOrUpdate(one)); }else { if (homeModule.getType().equals("请选择")){ homeModule.setType(null); } if (homeModule.getPage().equals("请选择")){ homeModule.setPage(null); } if (ToolUtil.isNotEmpty(homeModule.getBackgroundImage())) { try { homeModule.setDisplayType(ImageUtils.getImageDimensions(homeModule.getBackgroundImage()).getDisplayType()); } catch (IOException e) { throw new RuntimeException(e); } } return ResultUtil.success(homeModuleService.updateById(homeModule)); } return ResultUtil.success(homeModuleService.updateById(homeModule)); } } cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/HomeModule.java
@@ -93,4 +93,7 @@ */ @TableField("displayType") private Integer displayType; @TableField("storeId") private Integer storeId; } cloud-server-management/src/main/webapp/WEB-INF/view/system/tHomeModule/tHomeModule.html
@@ -49,6 +49,7 @@ <input hidden id="id" value="${data.id}"> <input hidden id="isOpen" value="${data.isOpen}"> <input hidden id="isTop" value="${data.isTop}"> <input hidden id="id_" value="${id}"> <input hidden id="backgroundImage1" value="${data.backgroundImage}"> <input hidden id="buttonImage1" value="${data.buttonImage}"> <div class="ibox-content"> cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js
@@ -51,7 +51,7 @@ var name =''; for(var i in selected){ if(typeof selected[i].id != "undefined"){ console.log( selected[i].ids,55555) console.log( selected[i].id,55555) name = selected[0].accountName if(name!=selected[i].accountName){ Feng.info("请选择相同运营商门店") cloud-server-management/src/main/webapp/static/modular/system/tHomeModule/tHomeModule.js
@@ -177,6 +177,7 @@ typeId:null, turnId:null, content:"", storeId:null, }; let name = $("#model").val(); data1.id = $("#id").val(); @@ -209,6 +210,7 @@ data1.typeId = $("#type").val(); data1.turnId = $("#pageId").val(); data1.content = jQuery.trim(THomeModuleDlg.editor.getContent()); data1.storeId = $("#id_").val(); if ( $("#roleType").val()==1){ if($("#title").val()==''){ @@ -253,6 +255,7 @@ Feng.info("请填写内容设置") return; } console.log(data1,1111) $.ajax({ url: Feng.ctxPath + "/tHomeModule/updateHomeModule", cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
@@ -179,15 +179,17 @@ }; TCompetition.platformSet = function () { var index = layer.open({ type: 2, title:'图文模块设置', area: ['100%', '100%'], //宽高 fix: false, //不固定 maxmin: true, content: Feng.ctxPath + '/tHomeModule/tHomeModule_platformSet/' + 1 }); this.layerIndex = index; if (this.check()) { var index = layer.open({ type: 2, title: '图文模块设置', area: ['100%', '100%'], //宽高 fix: false, //不固定 maxmin: true, content: Feng.ctxPath + '/tHomeModule/tHomeModule_platformSet/' + TCompetition.seItem.id }); this.layerIndex = index; } }; /** cloud-server-other/src/main/java/com/dsh/other/controller/HomeModuleController.java
@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController @RequestMapping("") public class HomeModuleController { @@ -22,19 +24,16 @@ @ResponseBody @PostMapping("/base/homeModule/getHomeModule") @ApiOperation(value = "获取平台配置模块详情【2.0】", tags = {"APP-加入玩湃"}) @ApiImplicitParams({ }) public ResultUtil<HomeModule> getHomeModule(){ HomeModule homeModule = homeModuleService.getOne(new QueryWrapper<HomeModule>().eq("isOpen", 1)); public ResultUtil<HomeModule> getHomeModule(Integer id){ HomeModule homeModule = homeModuleService.getById(id); homeModule.setName(homeModule.getModel()); return ResultUtil.success(homeModule); }
@@ -65,9 +65,9 @@ try { List<StoreConfig> list = storeConfigService.list(new QueryWrapper<StoreConfig>().eq("storeId", storeId) .orderByAsc("sort").eq("isOpen", 1)); HomeModule homeModule = homeModuleService.getOne(new QueryWrapper<HomeModule>().eq("isOpen", 1)); List<HomeModule> homeModules = homeModuleService.list(new QueryWrapper<HomeModule>().eq("isOpen", 1).eq("storeId",storeId)); List<StoreConfigVo> listVo = new ArrayList<>(); if(null != homeModule){ for (HomeModule homeModule : homeModules) { StoreConfigVo vo = new StoreConfigVo(); vo.setType(0); vo.setIsOpen(homeModule.getIsOpen()); cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java
@@ -153,22 +153,23 @@ } vip.setCouponList(couponVipRespList); String ticketJson = vip.getTicketJson(); JSONArray ticketJsonArray = JSONArray.parseArray(ticketJson); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); for (Object o : ticketJsonArray) { JSONObject ticketJsonObject = (JSONObject) o; TicketVipResp ticketVipResp = new TicketVipResp(); Integer count = ticketJsonObject.getInteger("count"); ticketVipResp.setName(ticketJsonObject.getString("name")); ticketVipResp.setTime(ticketJsonObject.getInteger("time")); ticketVipResp.setCount(ticketJsonObject.getInteger("count")); ticketVipResp.setStartTime(simpleDateFormat.format(new Date())); Date date = new Date(); // 给这个date加X天 date.setTime(date.getTime() + ticketJsonObject.getInteger("time") * 24 * 60 * 60 * 1000); ticketVipResp.setEffectiveTime(simpleDateFormat.format(date)); ticketVipRespList.add(ticketVipResp); if(ticketJson!=null){ JSONArray ticketJsonArray = JSONArray.parseArray(ticketJson); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); for (Object o : ticketJsonArray) { JSONObject ticketJsonObject = (JSONObject) o; TicketVipResp ticketVipResp = new TicketVipResp(); Integer count = ticketJsonObject.getInteger("count"); ticketVipResp.setName(ticketJsonObject.getString("name")); ticketVipResp.setTime(ticketJsonObject.getInteger("time")); ticketVipResp.setCount(ticketJsonObject.getInteger("count")); ticketVipResp.setStartTime(simpleDateFormat.format(new Date())); Date date = new Date(); // 给这个date加X天 date.setTime(date.getTime() + ticketJsonObject.getInteger("time") * 24 * 60 * 60 * 1000); ticketVipResp.setEffectiveTime(simpleDateFormat.format(date)); ticketVipRespList.add(ticketVipResp); } } vip.setTicketList(ticketVipRespList); } cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java
@@ -90,4 +90,8 @@ */ @TableField("displayType") private Integer displayType; @TableField("storeId") private Integer storeId; }
