cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -12,6 +12,7 @@ import com.dsh.account.model.vo.CoachSerchVO; import com.dsh.account.model.vo.RechargeRecordsVO; import com.dsh.account.service.*; import net.bytebuddy.asm.Advice; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,6 +33,7 @@ @Autowired private TAppUserService appUserService; /** * 充值记录列表数据 */ @@ -49,6 +51,8 @@ List<RechargeRecords> payStatus = rechargeRecordsService.list(new QueryWrapper<RechargeRecords>().eq("payStatus", 2)); for (RechargeRecords list : payStatus) { TAppUser byId = appUserService.getById(list.getAppUserId()); Integer addUserId = byId.getAddUserId(); } return payStatus; } cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -386,7 +386,7 @@ tAppUser = new TAppUser(); tAppUser.setCode(UUIDUtil.getNumberRandom(16)); tAppUser.setPhone(addAppUserVo.getPhone()); tAppUser.setPassword(Md5Util.MD5Encode(addAppUserVo.getPassword(), null)); tAppUser.setPassword(addAppUserVo.getPassword()); tAppUser.setIsVip(0); tAppUser.setState(1); tAppUser.setInsertTime(new Date()); cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
@@ -18,12 +18,12 @@ shelves from t_points_merchandise where 1 = 1 <where> <if test="name != null"> and `name` like concat('%', #{name}, '%') </if> <if test="type != null"> and type = #{type} and `type` = #{type} </if> <if test="redemptionMethod != null"> and redemptionMethod = #{redemptionMethod} @@ -34,7 +34,8 @@ <if test="state != null"> and `state` = #{state} </if> and `type` !=3 and `type` != 3 </where> order by insertTime desc </select> <select id="queryGoodsListOfSearchAudit" resultType="java.util.Map"> cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -93,6 +93,19 @@ } } } return result; }else if (query.getStoreId()!=null){ for (PaymentCompetition paymentCompetition : paymentCompetitions) { Integer competitionId = paymentCompetition.getCompetitionId(); Competition byId = cttService.getById(competitionId); if (byId!=null){ String storeId = byId.getStoreId(); if (storeId.contains(query.getStoreId().toString())){ result.add(paymentCompetition); } } } return result; } return paymentCompetitions; } cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java
@@ -18,4 +18,5 @@ private List<Integer> userIds; private Integer insertType; private Integer operatorId; private Integer storeId; } cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java
@@ -21,4 +21,5 @@ private Integer type; private Integer insertType; private Integer operatorId; private Integer storeId; } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -115,7 +115,7 @@ public Object getIncomeData(Integer operatorId,Integer storeId) { // 报名课程查询query RegisterOrderQuery query = new RegisterOrderQuery(); // 充值记录查询query // 充值记录查询query RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery(); // 赛事活动查询query CompetitionQuery competitionQuery = new CompetitionQuery(); @@ -124,13 +124,24 @@ IncomeQuery incomeQuery = new IncomeQuery(); // 场地预约记录查询query SiteBookingQuery siteBookingQuery = new SiteBookingQuery(); // 筛选运营商的是时候使用 List<Integer> storeIds = new ArrayList<>(); // 根据运营商ID 查询运营商下的所有门店 if (operatorId!=null){ List<TStore> stores = storeService.list(new QueryWrapper<TStore>().eq("operatorId", operatorId)); // 拿到该运营商下的门店id集合 List<Integer> storeIds = stores.stream().map(TStore::getId).collect(Collectors.toList()); query.setStoresIds(storeIds); siteBookingQuery.setStoreIds(storeIds); if (storeId==null){ if (operatorId!=null){ List<TStore> stores = storeService.list(new QueryWrapper<TStore>().eq("operatorId", operatorId)); // 拿到该运营商下的门店id集合 storeIds = stores.stream().map(TStore::getId).collect(Collectors.toList()); query.setStoresIds(storeIds); siteBookingQuery.setStoreIds(storeIds); competitionQuery.setOperatorId(operatorId); } }else { List<Integer> list = new ArrayList<>(); list.add(storeId); query.setStoresIds(list); siteBookingQuery.setStoreIds(list); competitionQuery.setStoreId(storeId); } @@ -197,23 +208,21 @@ incomeVOS.add(temp); } // 预约场地 if (operatorId!=null){ if (siteBookingQuery.getStoreIds().size()==0){ }else{ List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery); for (SiteBooking siteBooking : siteBookings) { IncomeVO temp = new IncomeVO(); if(siteBooking.getStatus()!=3){ continue; } temp.setInsertTime(siteBooking.getPayTime()); if (siteBooking.getPayMoney() != null) { temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString())); } incomeVOS.add(temp); // 说明当前运营商下没有门店 if (operatorId!=null && storeIds.size()==0){ }else{ List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery); for (SiteBooking siteBooking : siteBookings) { IncomeVO temp = new IncomeVO(); if(siteBooking.getStatus()!=3){ continue; } temp.setInsertTime(siteBooking.getPayTime()); if (siteBooking.getPayMoney() != null) { temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString())); } incomeVOS.add(temp); } } // 积分商品 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -482,7 +482,7 @@ pointsMerchandise.setInsertTime(new Date()); pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId); // 代替storeId pointsMerchandise.setShelves(storeId); pointsMerchandise.setShelves(1); Integer id = pointMercharsClient.add(pointsMerchandise); if(typeAll!=2){ if(useScope==2){ @@ -538,7 +538,6 @@ @ResponseBody public Object listOfIntegralGoodsAudit(String name, Integer type, Integer redemptionMethod , Integer userPopulation, Integer activeStatus) { Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(); IntegralGoodsOfSearch ofSearch = new IntegralGoodsOfSearch(); ofSearch.setPage(page); ofSearch.setName(name); cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
@@ -412,7 +412,7 @@ $("#back2").text(data.thisMonth); $("#back3").text(data.thisWeek); $("#back4").text(data.thisDay); option1 = { optionBack = { tooltip: { trigger: 'axis' @@ -639,7 +639,7 @@ // 使用刚指定的配置项和数据显示图表。 myChart.setOption(option); myChart1.setOption(option1); myChart1.setOption(optionBack); myChart7.setOption(option7); }); cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
@@ -387,6 +387,7 @@ }); ajax.set("type",1); ajax.set("storeId",$("#cCode").val()); ajax.start(); // 营收 var income = echarts.init(document.getElementById('income')); cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
@@ -766,7 +766,6 @@ Feng.info("请填写原价") return; } let type = document.querySelector('input[name="redemptionMethod"]:checked').value; if(type==''){ Feng.info("请选择兑换方式") return; @@ -837,42 +836,30 @@ return; } let company = document.querySelector('input[name="company"]:checked').value; var cityIds = []; var cts = ""; if (company === '2'){ var myselect=document.getElementById('cityData'); var seCity = myselect.options[myselect.selectedIndex].value; if (seCity === null || seCity === undefined || seCity === ''){ return Feng.error('请选中一个省市'); } cityIds.push(seCity); if (num > 0){ for (let i = 1; i <= num; i++) { var insSelect=document.getElementById('cityData'+i); var inData = insSelect.options[insSelect.selectedIndex].value; if (inData !== undefined || inData !== null || inData !== ''){ cityIds.push(inData); } } cts = cityIds.join(','); }else { cts = cityIds } } // var myselect=document.getElementById('cityData'); // var seCity = myselect.options[myselect.selectedIndex].value; // if (seCity === null || seCity === undefined || seCity === ''){ // return Feng.error('请选中一个省市'); // } // cityIds.push(seCity); // if (num > 0){ // for (let i = 1; i <= num; i++) { // var insSelect=document.getElementById('cityData'+i); // var inData = insSelect.options[insSelect.selectedIndex].value; // if (inData !== undefined || inData !== null || inData !== ''){ // cityIds.push(inData); // } // } // cts = cityIds.join(','); // }else { // cts = cityIds // } const commaSeparatedString = this.goodsPicArray.join(','); var stores = ""; if (company === '3'){ console.log('3---this.storeIds',this.storeIds); if (TGoodsInfoDlg.storeIds.length === 0 ){ return Feng.error('请至少选择一个门店'); } stores = this.storeIds.join(','); console.log('stores--===--',stores) } let text = TGoodsInfoDlg.editor.getContent(); console.log(text) @@ -912,7 +899,7 @@ ajax.set("typeAll",typeAll); ajax.set("name",name); ajax.set("price",price); ajax.set("type",type); ajax.set("type",3); ajax.set("integral",integral); ajax.set("cash",cash); ajax.set("cover",cover1); @@ -921,9 +908,9 @@ ajax.set("quantityIssued",quantityIssued); ajax.set("pickUpQuantity",pickUpQuantity); ajax.set("startTime",startTime); ajax.set("useScope",company); ajax.set("useScope",1); ajax.set("cityIds",cts); ajax.set("storeIds",stores); ajax.set("storeIds",""); ajax.set("text",text); ajax.set("sort",sort); ajax.set("cardType",document.querySelector('input[name="type"]:checked').value);
