cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -178,6 +178,7 @@ vo.setStuHeight(sts.getHeight()); vo.setStuWeight(sts.getWeight()); vo.setIsNot(sts.getIsDefault()); vo.setStuPhone(sts.getPhone()); stuListVos.add(vo); }); } cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -179,7 +179,7 @@ @ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"), @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"), }) public ResultUtil<BillingDetailsVo> getUserBillingDetails(String yearMonth,Integer recordId){ public ResultUtil<List<ConsumeDetail>> getUserBillingDetails(String yearMonth,Integer recordId){ try { Integer appUserId = tokenUtil.getUserIdFormRedis(); if(null == appUserId){ @@ -198,15 +198,17 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), @ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"), @ApiImplicitParam(value = "页码", name = "pageNum", required = true, dataType = "int"), @ApiImplicitParam(value = "每页数量", name = "pageSize", required = true, dataType = "int"), @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"), }) public ResultUtil<RechargeDetailsVo> wpGoldRechargeRecord(String yearMonth, Integer recordId){ public ResultUtil<List<RechargesDetail>> wpGoldRechargeRecord(String yearMonth, Integer recordId,Integer pageNum,Integer pageSize){ try { Integer appUserId = tokenUtil.getUserIdFormRedis(); if(null == appUserId){ return ResultUtil.tokenErr(); } return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId)); return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId,pageNum,pageSize)); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); @@ -265,13 +267,9 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), }) public ResultUtil<PointMallDetailsResponse> pointsMallList(MallRequest request){ public ResultUtil<List<Goods>> pointsMallList(MallRequest request){ try { Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); if(null == userIdFormRedis){ return ResultUtil.tokenErr(); } return ResultUtil.success(tauService.queryAppUserIntegral(request,userIdFormRedis)); return ResultUtil.success(tauService.queryAppUserIntegral(request)); }catch (Exception e){ return ResultUtil.runErr(); } @@ -333,7 +331,7 @@ @ApiOperation(value = "积分商城-兑换详情(实体、门票、优惠券)中的门店列表", tags = {"APP-使用福利"}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "lat", required = true, dataType = "String"), @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodsType", required = true, dataType = "String"), @ApiImplicitParam(value = "商品id", name = "pointsMerId", required = true, dataType = "int"), }) public ResultUtil<List<StoreResponse>> getExchangeStoreIds( Integer goodsType,Integer pointsMerId){ cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java
@@ -27,4 +27,7 @@ @ApiModelProperty(value = "是否默认（1. 是默认 2. 不是默认 ）") private Integer isNot; @ApiModelProperty(value = "学员手机号") private String stuPhone; } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/BillingDetailsVo.java
File was deleted cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ConsumeDetail.java
New file @@ -0,0 +1,19 @@ package com.dsh.account.model.vo.userBenefitDetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class ConsumeDetail { @ApiModelProperty(value = "名称") private String consumeName; @ApiModelProperty(value = "时间") private String consumeTime; @ApiModelProperty(value = "金额 例如 -90 ") private String consumeAmount; } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java
New file @@ -0,0 +1,39 @@ package com.dsh.account.model.vo.userBenefitDetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @Data public class Goods { @ApiModelProperty(value = "商品id") private Integer goodId; @ApiModelProperty(value = "商品封面图") private String goodImg; @ApiModelProperty(value = "商品名称") private String goodName; @ApiModelProperty(value = "1积分 2现金+积分") private Integer condition; @ApiModelProperty(value = "金额") private BigDecimal amount; @ApiModelProperty(value = "积分") private Integer integral; @ApiModelProperty(value = "适用范围： 1全部用户 2仅限会员 3仅限学员") private Integer belongsType; @ApiModelProperty(value = "商品类型： 1实物 2课包 3门票 4优惠券") private Integer goodsType; @ApiModelProperty(value = "已兑换数量") private Integer nums; } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java
@@ -22,4 +22,9 @@ @ApiModelProperty(value = "搜索内容") private String search; @ApiModelProperty(value = "页码") private Integer pageNum; @ApiModelProperty(value = "每页数量") private Integer pageSize; } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointMallDetailsResponse.java
@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data @@ -21,38 +20,5 @@ @ApiModelProperty(value = "商品列表") private List<Goods> goods; @Data public static class Goods{ @ApiModelProperty(value = "商品id") private Integer goodId; @ApiModelProperty(value = "商品封面图") private String goodImg; @ApiModelProperty(value = "商品名称") private String goodName; @ApiModelProperty(value = "1积分 2现金+积分") private Integer condition; @ApiModelProperty(value = "金额") private BigDecimal amount; @ApiModelProperty(value = "积分") private Integer integral; @ApiModelProperty(value = "适用范围： 1全部用户 2仅限会员 3仅限学员") private Integer belongsType; @ApiModelProperty(value = "商品类型： 1实物 2课包 3门票 4优惠券") private Integer goodsType; @ApiModelProperty(value = "已兑换数量") private Integer nums; } } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
@@ -31,8 +31,11 @@ @ApiModelProperty(value = "每人限额") private Integer perLimit; @ApiModelProperty(value = "所需类型（积分/积分+现金）") private String requiredType; @ApiModelProperty(value = "积分") private Integer integral; @ApiModelProperty(value = "现金") private BigDecimal cash; @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)") private Integer exchangeType; cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeCentVo.java
@@ -7,6 +7,9 @@ @Data public class RechargeCentVo { @ApiModelProperty(value = "类型id") private Integer chargeId; @ApiModelProperty(value = "玩湃币") private String wpGold;
@@ -15,18 +15,4 @@ @ApiModelProperty(value = "记录列表") private List<RechargesDetail> detailList; @Data public static class RechargesDetail{ @ApiModelProperty(value = "名称") private String consumeName; @ApiModelProperty(value = "时间") private String consumeTime; @ApiModelProperty(value = "金额 例如 -90 ") private String consumeAmount; } } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargePayRequest.java
@@ -13,7 +13,7 @@ @ApiModelProperty(value = "支付方式 1微信 2支付宝") private Integer payType; @ApiModelProperty(value = "支付金额") private BigDecimal payAmount; @ApiModelProperty(value = "充值类型id") private Integer chargeId; } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargesDetail.java
New file @@ -0,0 +1,22 @@ package com.dsh.account.model.vo.userBenefitDetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class RechargesDetail { @ApiModelProperty(value = "名称") private String consumeName; @ApiModelProperty(value = "时间") private String consumeTime; @ApiModelProperty(value = "金额 例如 -90 ") private String consumeAmount; } cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
@@ -4,7 +4,10 @@ import com.dsh.account.entity.RechargeRecords; import com.dsh.account.model.vo.userBenefitDetail.RechargeDetailsVo; import com.dsh.account.model.vo.userBenefitDetail.RechargePayRequest; import com.dsh.account.model.vo.userBenefitDetail.RechargesDetail; import com.dsh.account.util.ResultUtil; import java.util.List; /** * <p> @@ -16,7 +19,7 @@ */ public interface RechargeRecordsService extends IService<RechargeRecords> { RechargeDetailsVo getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId); List<RechargesDetail> getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId,Integer pageNum,Integer pageSize); ResultUtil rechargeCenPayment(Integer userIdFormRedis, RechargePayRequest request);
@@ -111,7 +111,7 @@ * @param recordId 记录 * @return */ BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId); List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId); /** * 注销账号 @@ -121,7 +121,7 @@ List<RechargeCentVo> getSysRechargeConfig(Integer appUserId); PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis); List<Goods> queryAppUserIntegral(MallRequest request); ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request);
@@ -16,12 +16,17 @@ import com.dsh.account.mapper.TAppUserMapper; import com.dsh.account.model.vo.userBenefitDetail.RechargeDetailsVo; import com.dsh.account.model.vo.userBenefitDetail.RechargePayRequest; import com.dsh.account.model.vo.userBenefitDetail.RechargesDetail; import com.dsh.account.service.RechargeRecordsService; import com.dsh.account.util.DateTimeHelper; import com.dsh.account.util.PayMoneyUtil; import com.dsh.account.util.ResultUtil; import com.dsh.account.util.UUIDUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -67,9 +72,8 @@ @Override public RechargeDetailsVo getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId) { RechargeDetailsVo vo = new RechargeDetailsVo(); List<RechargeDetailsVo.RechargesDetail> details = new ArrayList<>(); public List<RechargesDetail> getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId,Integer pageNum,Integer pageSize) { List<RechargesDetail> details = new ArrayList<>(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm"); Date monthStart = null; @@ -82,17 +86,11 @@ monthEnd = DateTimeHelper.getCurrentMouthEnd(); } TAppUser tAppUser = tappMapper.selectById(appUserId); if (null != tAppUser){ vo.setWpGold(tAppUser.getPlayPaiCoins()); }else { vo.setWpGold(0); } // 1.赛事报名 List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId); if (playPaiFGoldPayRecord.size() > 0 ){ for (PaymentCompetition competition : playPaiFGoldPayRecord) { RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail(); RechargesDetail consumeDetail = new RechargesDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() ); consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime())); consumeDetail.setConsumeAmount("-" + competition.getAmount()); @@ -103,7 +101,7 @@ List<TCoursePackagePayment> appuserCourseList = cpClient.getAppuserCourseList(appUserId); if (appuserCourseList.size() > 0){ for (TCoursePackagePayment tCoursePackagePayment : appuserCourseList) { RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail(); RechargesDetail consumeDetail = new RechargesDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg() ); consumeDetail.setConsumeTime(simpleDateFormat.format(tCoursePackagePayment.getInsertTime())); consumeDetail.setConsumeAmount("-" + tCoursePackagePayment.getPlayPaiCoin()); @@ -114,7 +112,7 @@ List<SiteBooking> siteBookings = stClient.wanpaiGoldSiteBookingList(appUserId); if (siteBookings.size() > 0 ){ for (SiteBooking booking : siteBookings) { RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail(); RechargesDetail consumeDetail = new RechargesDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.name()); consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime())); consumeDetail.setConsumeAmount("-" + booking.getPayMoney()); @@ -130,7 +128,7 @@ .between("insertTime", monthStart, monthEnd)); if (rechargeRecords.size() > 0) { for (RechargeRecords rechargeRecord : rechargeRecords) { RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail(); RechargesDetail consumeDetail = new RechargesDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.name() + "：" + rechargeRecord.getPlayPaiCoins()); consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime())); consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount()); @@ -138,9 +136,9 @@ } } if (details.size() > 0 ){ Collections.sort(details, new Comparator<RechargeDetailsVo.RechargesDetail>() { Collections.sort(details, new Comparator<RechargesDetail>() { @Override public int compare(RechargeDetailsVo.RechargesDetail o1, RechargeDetailsVo.RechargesDetail o2) { public int compare(RechargesDetail o1, RechargesDetail o2) { try { Date date1 = simpleDateFormat.parse(o1.getConsumeTime()); Date date2 = simpleDateFormat.parse(o2.getConsumeTime()); @@ -152,8 +150,9 @@ } }); } vo.setDetailList(details); return vo; Pageable pageable = PageRequest.of(pageNum - 1, pageSize); Page<RechargesDetail> page = getPage(details, pageable); return page.getContent(); } @Override @@ -164,15 +163,19 @@ RechargeRecords rechargeRecords = new RechargeRecords(); rechargeRecords.setCode(code); rechargeRecords.setAppUserId(userIdFormRedis); rechargeRecords.setAmount(request.getPayAmount()); List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig(); BigDecimal amount = BigDecimal.ZERO; if (rechargeConfig.size() > 0){ for (Map<String, Object> stringObjectMap : rechargeConfig) { Object o = stringObjectMap.get("money"); if (o.equals(request.getPayAmount())){ if (tAppUser.getIsVip() == 1){ Integer chargeId = (Integer) stringObjectMap.get("chargeId"); if (chargeId.equals(request.getChargeId())) { Long o = (Long) stringObjectMap.get("money"); amount = BigDecimal.valueOf(o); rechargeRecords.setAmount(BigDecimal.valueOf(o)); if (tAppUser.getIsVip() == 1) { rechargeRecords.setPlayPaiCoins((Integer) stringObjectMap.get("MemberCoins")); }else { } else { rechargeRecords.setPlayPaiCoins((Integer) stringObjectMap.get("usersCoins")); } } @@ -185,9 +188,9 @@ try { switch (request.getPayType()){ case 1: return WeChatPayment(code,request.getPayAmount()); return WeChatPayment(code,amount); case 2: return AlipayPayment(code,request.getPayAmount()); return AlipayPayment(code,amount); default: break; } @@ -332,4 +335,11 @@ return null; } // 对数据进行分页处理的方法 private static Page<RechargesDetail> getPage(List<RechargesDetail> dataList, Pageable pageable) { int start = (int) pageable.getOffset(); int end = Math.min((start + pageable.getPageSize()), dataList.size()); return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size()); } } cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -38,6 +38,10 @@ import com.dsh.account.util.*; import com.dsh.account.util.akeylogin.Md5Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; @@ -484,9 +488,8 @@ } @Override public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) { BillingDetailsVo vo = new BillingDetailsVo(); List<BillingDetailsVo.ConsumeDetail> details = new ArrayList<>(); public List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) { List<ConsumeDetail> details = new ArrayList<>(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm"); Date monthStart = null; @@ -502,7 +505,7 @@ List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(appUserId); if (allCompetitionPayRecord.size() > 0 ){ for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) { BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); ConsumeDetail consumeDetail = new ConsumeDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg()); consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime())); consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount()); @@ -513,7 +516,7 @@ List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(appUserId); if (cancelOrderOfUserPayRecord.size() > 0 ){ for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) { BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); ConsumeDetail consumeDetail = new ConsumeDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg()); consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime())); consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount()); @@ -524,7 +527,7 @@ List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(appUserId); if (amountPayRecord.size() > 0 ){ for (TCoursePackagePayment coursePackagePayment : amountPayRecord) { BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); ConsumeDetail consumeDetail = new ConsumeDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg()); consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime())); consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment()); @@ -535,7 +538,7 @@ List<SiteBooking> allSiteBookingList = stClient.getAllSiteBookingList(appUserId); if (allSiteBookingList.size() > 0){ for (SiteBooking booking : allSiteBookingList) { BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); ConsumeDetail consumeDetail = new ConsumeDetail(); if (booking.getStatus() != 5){ consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg()); consumeDetail.setConsumeAmount("-" + booking.getPayMoney()); @@ -557,7 +560,7 @@ .between("insertTime", monthStart, monthEnd)); if (vipPayments.size() > 0) { for (VipPayment vipPayment : vipPayments) { BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); ConsumeDetail consumeDetail = new ConsumeDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg()); consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime())); consumeDetail.setConsumeAmount("-" + vipPayment.getAmount()); @@ -571,7 +574,7 @@ .between("insertTime", monthStart, monthEnd)); if (rechargeRecords.size() > 0) { for (RechargeRecords rechargeRecord : rechargeRecords) { BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail(); ConsumeDetail consumeDetail = new ConsumeDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins()); consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime())); consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount()); @@ -579,9 +582,9 @@ } } if (details.size() > 0 ){ Collections.sort(details, new Comparator<BillingDetailsVo.ConsumeDetail>() { Collections.sort(details, new Comparator<ConsumeDetail>() { @Override public int compare(BillingDetailsVo.ConsumeDetail record1, BillingDetailsVo.ConsumeDetail record2) { public int compare(ConsumeDetail record1, ConsumeDetail record2) { SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm"); Date date1 = null; Date date2 = null; @@ -596,8 +599,7 @@ } }); } vo.setDetails(details); return vo; return details; } @Override @@ -617,6 +619,7 @@ if (rechargeConfig.size() > 0 ){ for (Map<String, Object> stringObjectMap : rechargeConfig) { RechargeCentVo vo = new RechargeCentVo(); vo.setChargeId((Integer) stringObjectMap.get("money")); vo.setAmount(""+stringObjectMap.get("money")); if (tAppUser.getIsVip() == 1){ vo.setWpGold(stringObjectMap.get("MemberCoins")+""); @@ -630,14 +633,8 @@ } @Override public PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis) { PointMallDetailsResponse detailsResponse = new PointMallDetailsResponse(); List<PointMallDetailsResponse.Goods> goods = new ArrayList<>(); TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis); detailsResponse.setName(tAppUser.getName()); detailsResponse.setIntegral(tAppUser.getIntegral()); detailsResponse.setHeadImg(tAppUser.getHeadImg()); public List<Goods> queryAppUserIntegral(MallRequest request ) { List<Goods> goods = new ArrayList<>(); CommodityRequest commodityRequest = new CommodityRequest(); commodityRequest.setLon(request.getLon()); @@ -645,7 +642,7 @@ List<PointsMerchandise> vicinityGoods = mcClient.getVicinityGoods(commodityRequest); if (vicinityGoods.size() > 0) { for (PointsMerchandise vicinityGood : vicinityGoods) { PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods(); Goods commodity = new Goods(); switch (vicinityGood.getType()) { case 1: commodity.setGoodId(vicinityGood.getId()); @@ -702,7 +699,7 @@ List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest); if (allCoupons.size() > 0) { for (Coupon allCoupon : allCoupons) { PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods(); Goods commodity = new Goods(); commodity.setGoodId(allCoupon.getId()); commodity.setGoodName(allCoupon.getName()); commodity.setCondition(allCoupon.getRedemptionMethod()); @@ -728,17 +725,17 @@ switch (request.getRank()){ case 1: goods = goods.stream() .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral).reversed()) .sorted(Comparator.comparing(Goods::getIntegral).reversed()) .collect(Collectors.toList()); break; case 2: goods = goods.stream() .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral)) .sorted(Comparator.comparing(Goods::getIntegral)) .collect(Collectors.toList()); break; case 3: goods = goods.stream() .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getNums).reversed()) .sorted(Comparator.comparing(Goods::getNums).reversed()) .collect(Collectors.toList()); break; default: @@ -751,8 +748,16 @@ .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType())) .collect(Collectors.toList()); } detailsResponse.setGoods(goods); return detailsResponse; Pageable pageable = PageRequest.of(request.getPageNum() - 1, request.getPageSize()); Page<Goods> page = getPage(goods, pageable); return page.getContent(); } // 对数据进行分页处理的方法 private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) { int start = (int) pageable.getOffset(); int end = Math.min((start + pageable.getPageSize()), dataList.size()); return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size()); } @Override cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -150,10 +150,11 @@ detailsVo.setPerLimit(merchandise.getPickUpQuantity()); if (merchandise.getRedemptionMethod() == 1){ detailsVo.setExchangeType(1); detailsVo.setRequiredType(merchandise.getIntegral() + "积分"); detailsVo.setIntegral(merchandise.getIntegral()); }else { detailsVo.setExchangeType(2); detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash()); detailsVo.setIntegral(merchandise.getIntegral()); detailsVo.setCash(merchandise.getCash()); } detailsVo.setCost(merchandise.getPrice()); if (merchandise.getUseScope() == 1){ @@ -210,9 +211,10 @@ detailsVo.setResidueNum(merchandise.getQuantityIssued()-count); detailsVo.setPerLimit(merchandise.getPickUpQuantity()); if (merchandise.getRedemptionMethod() == 1){ detailsVo.setRequiredType(merchandise.getIntegral() + "积分"); detailsVo.setIntegral(merchandise.getIntegral()); }else { detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash()); detailsVo.setIntegral(merchandise.getIntegral()); detailsVo.setCash(merchandise.getCash()); } detailsVo.setCost(merchandise.getPrice()); if (merchandise.getUseScope() == 1){ @@ -257,9 +259,10 @@ detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums); detailsVo.setPerLimit(coupon.getPickUpQuantity()); if (merchandise.getRedemptionMethod() == 1){ detailsVo.setRequiredType(merchandise.getIntegral() + "积分"); detailsVo.setIntegral(merchandise.getIntegral()); }else { detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash()); detailsVo.setIntegral(merchandise.getIntegral()); detailsVo.setCash(merchandise.getCash()); } if (coupon.getUseScope() == 1){ detailsVo.setBelongs("全国通用"); cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java
@@ -31,8 +31,11 @@ @ApiModelProperty(value = "每人限额") private Integer perLimit; @ApiModelProperty(value = "所需类型（积分/积分+现金）") private String requiredType; @ApiModelProperty(value = "积分") private Integer integral; @ApiModelProperty(value = "现金") private BigDecimal cash; @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)") cloud-server-management/src/main/java/com/dsh/ManagementApplication.java
@@ -23,7 +23,7 @@ @EnableFeignClients @MBCloudApplication @Import({WebConfig.class}) @MapperScan("com.dsh.app.mapper") @MapperScan("com.dsh.course.mapper") @ServletComponentScan @EnableScheduling public class ManagementApplication { cloud-server-management/src/main/java/com/dsh/course/advice/ControllerException.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/Agreement.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/BaseBean.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/CancleOrder.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/Car.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/CarBrand.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/CarModel.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/CarService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/City.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/HotAddress.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/Img.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/MotorModel.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/OpenCity.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/OpenCityBusiness.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/Phone.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/Problem.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/PushOrder.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/SensitiveWords.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/ServerCarModel.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/SysIntegral.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/SystemNotice.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/SystemPrice.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/TNotices.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/entity/VersionManagement.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IncomeClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/SmsreordClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/TPubWithdrawalClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/UserClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Company.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgAndNameReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/GetUserInfoByNameOrPhone.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/IncomeReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryIncomeListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryWithdrawalReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/SmsCodeReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/AdvertisementClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyCityClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityHistoryClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOnlineClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOrderClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityRegisterClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserClinet.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserRedPackerRecordClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityBalanceClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount1Client.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount2Client.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityInviteClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRedenvelpoeClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRegisteredClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserCouponRecordClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/VerifyClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Advertisement.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyCityQueryCompanyReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyInfoRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryStateAndFlgReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertOrUpdateReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityOnlineReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/FranchiseeListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetBlanceListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCompanyListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCouponStaticReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetDiscountStaticReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetFranchiseeList1Req.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetRedListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/LargeCouponUpdateReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryAdvertisementReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryBean.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryCompanyCityReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityHistoryReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityOnlineReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverGetListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryOnlineDriverReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserActivityListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/RegisteredQuerySelectReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SaveCompanyReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SelectCountReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TCompanyCityResp.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TDriverReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserOutUser.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateCompanyDriverReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateUserRedPacketRecordReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserActivityInsertOrUpdateReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordQueryReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserLargeCouponReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserRedPacketRecordRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedSearchReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/app/OpenCityClinet.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/UserClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/GetTokenRequest.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/RefreshTokenRequest.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/TokenResponse.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverOrdersClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverServiceClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverTrainClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverSelectCountReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryAuthDriverReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryCanselectCarReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverNoPageReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithholdingDto.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListVo.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/EvaluationClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/model/GetOrderEvaluateListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/OrderPositionClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/DriverPositionReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/OrderPosition.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ComplaintClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderLogisticsClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderPrivateCarClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ReassignClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/TransactionDetailsClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetAllTradeMoneyReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetPrivateCarOrderDetailById.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargeListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargerAllReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsSelectCountReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCar.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCarSelectCountReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/PrivateCarReassignReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectPrivateCarDriverReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectSmallDriverReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryComplaintListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryLoginsicsListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryPrivateCarOrderReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/TransactionDetailsReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/UpdateStateReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/OrderCancelClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/model/OrderCancelRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/PaymentClient.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/model/QueryPaymentRecordReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/AgreementMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/CancleOrderMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/CarBrandMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/CarInsuranceMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/CarMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/CarModelMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/CarServiceMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/DictMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/DriverPunishMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/DriverVerifyMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/HotAddressMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/ImgMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/LoginLogMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/MenuMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/MotorModelMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/NoticeMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/OpenCityBusinessMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/OpenCityMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/OperationLogMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/PhoneMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/ProblemMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/PushOrderMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/RegionMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/RelationMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/SensitiveWordsMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/ServerCarModelMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponActivityMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponRecordMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/SysIntegralMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/SysRedPacketRecordMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/SystemNoticeMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/SystemPriceMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TAgreementMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TAuditRecordMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TCarBrandMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TCarMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TCarModelMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TCarServiceMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeFoundationMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeRuleMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialTimeSoltMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TFeedbackMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TNoticesMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityBusinessMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TOrderEvaluateMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TPhoneMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TPopularizeCodeMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TProblemMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TRegionMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TServerCarmodelMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSysCancleOrderMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSysFaceDistinguishMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSysPushOrderMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSysReformistMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSysSensitiveWordsMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemNoticeMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceServiceMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TUserLargeCouponMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TVersionManagementMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TbBannerMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TbChatSetMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TbGuidePageMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TbHotAddressMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TbStartPageMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TbUserExitMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/TbVoiceMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/mapper/VersionManagementMapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/dto/CarServerRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/dto/DriverActivityHistory.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/dto/GetPhoneInfoRequest.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/dto/IntegralDto.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/dto/TNoticeListWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/dto/TNoticeWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/node/MenuNode.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/node/ZTreeNode.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/BaseListWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/BaseWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/CancleOrderReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/CancleOrderRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/CarInfoRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/CarServiceReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/CarServiceRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/CityReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/CityRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/ImgReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/ImgRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/NoReadNoticeNumReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/OrdersWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/ProblemWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/PushOrderListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/PushOrderListRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/PushOrderListWapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/QueryHotAddressWrapper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/ServerCarModelListRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/ServerCarModelRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/ServerCarModelWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/SysIntegralRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/SystemNoticeAddReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/SystemNoticeListReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/SystemNoticeListWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/SystemNoticeWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/SystemPriceReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/SystemPriceRes.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/model/vo/VersionWarpper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IAgreementService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ICancleOrderService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ICarService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ICarServiceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IHotAddressService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IImgService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IOpenCityBusinessService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IOpenCityService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IPhoneService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IProblemService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IPushOrderService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ISensitiveWordsService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IServerCarModelService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ISysIntegralService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ISystemNoticeService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ISystemPriceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/ITNoticesService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/IVersionManagementService.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/AgreementServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/CancleOrderServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/CityServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/HotAddressServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/ImgServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/OpenCityBusinessServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/OpenCityServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/PhoneServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/ProblemServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/PushOrderServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/SensitiveWordsServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/ServerCarModelServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/SysIntegralServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/SystemNoticeServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/SystemPriceServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/TNoticesService1Impl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/service/impl/VersionManagementServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/DateTimeHelper.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/DateUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/DoubleUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/EmojiUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/GoogleMap/AddressComponentsVo.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/GoogleMap/DistancematrixVo.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/GoogleMap/FindPlaceFromTextVo.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/GoogleMap/GeocodeVo.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/GoogleMap/GoogleMapUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/GoogleMap/ReverseGeocodeVo.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/HeaderAuthUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/JsonUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/LocalDateTimeUtils.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/RedisUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/ResultUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/StrUtils.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/StringUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/StudyTimeUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/TokenUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/httpClinet/HttpResult.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/midtrans/Beneficiaries.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/midtrans/DirectRefundTransaction.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/midtrans/MidtransUtil.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/midtrans/PaymentNotice.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/midtrans/Payouts.java
File was deleted cloud-server-management/src/main/java/com/dsh/course/util/midtrans/TokenResult.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityHistoryController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOnlineController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOrderController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityRegisteredController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/HomeController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/ReportController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponActivityController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponRecordController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysRedPacketRecord1Controller.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAdvertisementController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAgreementController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAuditRecordController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarBrandController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarModelController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TChatSetController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCompanyController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TComplaintController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverVerifyVerifyController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeFoundationController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeRuleController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialTimeSoltController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TFeedbackController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TGuidePageController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/THotAddressController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TInvoiceController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TMotorModelController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TNoticesController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOpenCityController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOrderEvaluateController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TProblemController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TPubWithdrawalController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSmsrecordController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TStartPageController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysReformistController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysSensitiveWordsController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserExitController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserLargeController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserRedPacketRecordController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVerifiedController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVersionManagementController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVoiceController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TbBannerController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityBalanceController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount1Controller.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount2Controller.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityInviteController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRedenvelopeController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRegisteredController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserCouponRecordController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TDispatchController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TLineController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TReassignController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSiteController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSystemPriceController.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
@@ -82,17 +82,7 @@ Integer language = UserExt.getLanguage(); List<MenuNode> menus = menuService.getMenusByRoleIds(roleList); List<MenuNode> titles = MenuNode.buildTitle(menus); if(language==1 || language==null){ }else if(language==2){ for (MenuNode menu : menus) { menu.setName(menu.getEname()); } }else if(language==3){ for (MenuNode menu : menus) { menu.setName(menu.getBname()); } } @@ -109,10 +99,6 @@ model.addAttribute("tips", a); return "/login.html"; } //设置上级ID if (SinataUtil.isNotEmpty(user.getObjectId())){ // ShiroKit.getUser().setObjectId(user.getObjectId()); } //设置角色 // ShiroKit.getUser().setRoleType(user.getRoleType()); @@ -135,10 +121,10 @@ model.addAttribute("avatar", avatar); model.addAttribute("userName", user.getName()); model.addAttribute("type", 0); model.addAttribute("passwordHint", null == user.getPassWordUpdate() || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis() ? a: ""); // model.addAttribute("passwordHint", // null == user.getPassWordUpdate() // || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis() // ? a: ""); return "/index.html"; }
@@ -2,12 +2,6 @@ import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.feignClient.account.model.Company; import com.dsh.course.feignClient.activity.CompanyClient; import com.dsh.course.feignClient.activity.DriverClient; import com.dsh.course.feignClient.activity.model.CompanyInfoRes; import com.dsh.course.feignClient.activity.model.CompanyQueryStateAndFlgReq; import com.dsh.course.feignClient.activity.model.UpdateCompanyDriverReq; import com.dsh.course.mapper.UserMapper; import com.dsh.guns.config.UserExt; import com.dsh.guns.config.properties.GunsProperties; @@ -40,11 +34,13 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.naming.NoPermissionException; import javax.validation.Valid; import java.io.File; import java.util.*; import java.util.Date; import java.util.Map; import java.util.Objects; import java.util.UUID; /** * 系统管理员控制器 @@ -64,14 +60,9 @@ @Autowired private IUserService userService; @Resource private DriverClient itDriverService; @Autowired private IRoleService roleService; @Resource private CompanyClient itCompanyService; /** @@ -167,7 +158,6 @@ if (user.getPassword().equals(oldMd5)) { String newMd5 = MD5.md5(newPwd); user.setPassword(newMd5); user.setPassWordUpdate(new Date()); user.updateById(); return SUCCESS_TIP; } else { @@ -231,11 +221,6 @@ User objectUser = UserFactory.createUser(user); //查找平台所属公司 //Search for the company that owns the platform. Company company = itCompanyService.getCompanyByTypeAndFlag(new CompanyQueryStateAndFlgReq(1,3)); if (SinataUtil.isNotEmpty(company)){ objectUser.setObjectId(company.getId()); } objectUser.setPassWordUpdate(new Date()); this.userService.save(objectUser); return SUCCESS_TIP; @@ -348,28 +333,6 @@ assertAuth(userId); this.userService.setStatus(userId, ManagerStatus.FREEZED.getCode()); User user = userService.getById(userId); if (user.getRoleType() == 2){ //查询分公司 Query branch office CompanyInfoRes company = itCompanyService.queryById(user.getObjectId()); company.setState(1); itCompanyService.updateCompany(company); //设置该分公司下的所有司机状态 //Set the status of all drivers under this branch itDriverService.updateCompanyDriverState(new UpdateCompanyDriverReq(3,company.getId())); }else if (user.getRoleType() == 3){ //查询加盟商 //Search for franchisees CompanyInfoRes franchisee = itCompanyService.queryById(user.getObjectId()); franchisee.setState(1); itCompanyService.updateCompany(franchisee); //设置该加盟商下的所有司机状态 //Set the status of all drivers under this franchisee itDriverService.updateFranchiseeDriverState(new UpdateCompanyDriverReq(3,franchisee.getId())); } return SUCCESS_TIP; } @@ -387,29 +350,6 @@ assertAuth(userId); this.userService.setStatus(userId, ManagerStatus.OK.getCode()); User user = userService.getById(userId); if (user.getRoleType() == 2){ //查询分公司 //Query branch office CompanyInfoRes company = itCompanyService.queryById(user.getObjectId()); company.setState(0); itCompanyService.updateCompany(company); //设置该分公司下的所有司机状态 ////Set the status of all drivers under this branch itDriverService.updateCompanyDriverState(new UpdateCompanyDriverReq(2,company.getId())); }else if (user.getRoleType() == 3){ //查询加盟商 ////Search for franchisees CompanyInfoRes franchisee = itCompanyService.queryById(user.getObjectId()); franchisee.setState(0); itCompanyService.updateCompany(franchisee); //设置该加盟商下的所有司机状态 //Set the status of all drivers under this branch itDriverService.updateFranchiseeDriverState(new UpdateCompanyDriverReq(2,franchisee.getId())); } return SUCCESS_TIP; }
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/enums/RuleStatusEnum.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CarInsurance.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Driver.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivity.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityHistory.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOnline.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOrder.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityRegistered.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivitySubsidy.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverOnline.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverPunish.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverTrain.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverUpdateReq.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverVerify.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/GDInterface.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Income.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/LineShiftDriver.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderCancel.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderLogistics.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/PaymentRecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Region.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponActivity.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponRecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysRedPacketRecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAdvertisement.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAgreement.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAuditRecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCar.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarBrand.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarModel.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompany.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompanyCity.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TComplaint.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDispatch.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriver.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverLine.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverReqs.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeFoundation.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeRule.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecial.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecialTimeSolt.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TFeedback.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralGoods.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralOrder.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TInvoice.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TLocation.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCity.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCityBusiness.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharter.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharteredCar.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCrossCity.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderEvaluate.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderLogistics.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPosition.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPrivateCar.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderTaxi.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPhone.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPopularizeCode.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TProblem.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubTransactionDetails.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubWithdrawal.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TReassign.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TRegion.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TServerCarmodel.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSmsrecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysCancleOrder.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysFaceDistinguish.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysIntegral.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysPushOrder.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysReformist.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSensitiveWords.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSet.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemNotice.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPrice.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPriceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUser.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserLargeCoupon.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserRedPacketRecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVerified.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVersionManagement.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbBanner.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbChatSet.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbGuidePage.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbHotAddress.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbStartPage.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbUserExit.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbVoice.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TransactionDetails.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
@@ -40,11 +40,6 @@ * 密码 */ private String password; /** * 密码修改时间 */ @TableField("passWordUpdate") private Date passWordUpdate; /** * md5密码盐 */ @@ -89,32 +84,7 @@ * 保留字段 */ private Integer version; /** * 角色类型 1=平台 2=分公司 3=加盟商 */ @TableField("roleType") private Integer roleType; /** * 对象ID */ @TableField("objectId") private Integer objectId; public Integer getRoleType() { return roleType; } public void setRoleType(Integer roleType) { this.roleType = roleType; } public Integer getObjectId() { return objectId; } public void setObjectId(Integer objectId) { this.objectId = objectId; } public Integer getId() { return id; @@ -144,13 +114,6 @@ return password; } public Date getPassWordUpdate() { return passWordUpdate; } public void setPassWordUpdate(Date passWordUpdate) { this.passWordUpdate = passWordUpdate; } public void setPassword(String password) { this.password = password; cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivity.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityBalance.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount1.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount2.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityInvite.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRedenvelope.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRegistered.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserCouponRecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserRedPacketRecord.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/DriverVerifyService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IDriverOnlineService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponActivityService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponRecordService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysRedPacketRecordService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAdvertisementService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAgreementService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAuditRecordService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarBrandService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarModelService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarServiceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCompanyService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDispatchService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverLineService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverServiceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeFoundationService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeRuleService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialTimeSoltService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITFeedbackService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralGoodsService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralOrderService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLineShiftService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLocationService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITMotorModelService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITNoticesService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityBusinessService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderCharterService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderEvaluateService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderLogisticsService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPositionService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPrivateCarService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPhoneService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITProblemService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubTransactionDetailsService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubWithdrawalService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITRegionService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITServerCarmodelService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysCancleOrderService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysFaceDistinguishService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysIntegralService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysPushOrderService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysReformistService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysSensitiveWordsService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemNoticeService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceServiceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserLargeService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITVersionManagementService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbBannerService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbChatSetService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbGuidePageService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbHotAddressService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbStartPageService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbUserExitService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbVoiceService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserActivityDiscount1Service.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserCouponRecordService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserRedPacketRecordService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/TPopularizeCodeService.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DriverVerifyServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAgreementServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAuditRecordServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarBrandServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarModelServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDispatchServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeFoundationServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeRuleServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialTimeSoltServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TFeedbackServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineShiftServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLocationServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TMotorModelServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TNoticesServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderCharterServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPositionServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPhoneServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPopularizeCodeServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TProblemServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TRegionServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysIntegralServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysReformistServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TUserLargeCouponServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TVersionManagementServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbBannerServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbChatSetServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbGuidePageServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbHotAddressServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbStartPageServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbUserExitServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbVoiceServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java
File was deleted cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/TaskUtil.java
@@ -1,8 +1,6 @@ package com.dsh.guns.modular.system.util; import com.dsh.guns.modular.system.service.ITbUserExitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,22 +12,8 @@ public class TaskUtil { @Autowired private ITbUserExitService userExitService; /** * 每分钟 */ @Scheduled(cron = "0 */1 * * * ?") public void taskDay(){ try { userExitService.getSevenDay(); }catch (Exception e){ e.printStackTrace(); } }
@@ -1,10 +1,5 @@ package com.dsh.guns.modular.system.util.task.base; import cn.mb.cloud.common.core.util.SpringContextHolder; import com.dsh.guns.modular.system.service.ITDriverService; import com.dsh.guns.modular.system.service.ITNoticesService; import com.dsh.guns.modular.system.service.ITSystemNoticeService; import com.dsh.guns.modular.system.service.ITUserService; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -17,20 +12,6 @@ @Override public abstract void execute(JobExecutionContext context) throws JobExecutionException; protected ITUserService tUserService; //用户 protected ITNoticesService tNoticesService; //公告 protected ITSystemNoticeService tSystemNoticeService; //公告记录 protected ITDriverService tDriverService; //司机 public AbstractJob(){ //this.exhibitionService = SpringContextsUtil.getBean("exhibitionService", IExhibitionService.class); this.tUserService = SpringContextHolder.getBean( ITUserService.class); this.tNoticesService = SpringContextHolder.getBean( ITNoticesService.class); this.tSystemNoticeService = SpringContextHolder.getBean( ITSystemNoticeService.class); this.tDriverService = SpringContextHolder.getBean( ITDriverService.class); } } cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/jobs/AddNotice.java
@@ -1,19 +1,9 @@ package com.dsh.guns.modular.system.util.task.jobs; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.course.entity.TNotices; import com.dsh.guns.core.util.SinataUtil; import com.dsh.guns.modular.system.model.TDriver; import com.dsh.guns.modular.system.model.TSystemNotice; import com.dsh.guns.modular.system.model.TUser; import com.dsh.guns.modular.system.util.task.base.AbstractJob; import lombok.NoArgsConstructor; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import java.util.Date; import java.util.List; /** * 添加公告记录 @@ -25,66 +15,5 @@ @Override public void execute(JobExecutionContext context) throws JobExecutionException { JobDataMap maps = context.getMergedJobDataMap(); Integer noticeId = maps.getIntValue("noticeId"); try { System.out.println("----定时1秒后生成公告记录-----"); TNotices tNotices = tNoticesService.getById(noticeId); if (SinataUtil.isNotEmpty(tNotices)){ if (tNotices.getIsUser() == 2){ List<TUser> tUsers = tUserService.getBaseMapper().selectList(new QueryWrapper<TUser>().eq("state",1)); //发送公告给用户 for (TUser user : tUsers){ TSystemNotice notice = new TSystemNotice(); notice.setType(1); notice.setUserType(1); notice.setNoticesId(noticeId); notice.setContent(tNotices.getContent()); notice.setUserId(user.getId()); notice.setInsertTime(new Date()); notice.setRead(1); tSystemNoticeService.save(notice); /*Map<String,Object> map = new HashMap<String,Object>(); map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是 map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是 map.put("type", 2); //消息类型 1=互动 2=公告 map.put("id", record.getId()); //对象ID JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/ } } if (tNotices.getIsDriver() == 2){ List<TDriver> tDrivers = tDriverService.getBaseMapper().selectList(new QueryWrapper<TDriver>().eq("authState",2)); //发送公告给用户 for (TDriver driver : tDrivers){ TSystemNotice notice = new TSystemNotice(); notice.setType(1); notice.setUserType(2); notice.setNoticesId(noticeId); notice.setContent(tNotices.getContent()); notice.setUserId(driver.getId()); notice.setInsertTime(new Date()); notice.setRead(1); tSystemNoticeService.save(notice); /*Map<String,Object> map = new HashMap<String,Object>(); map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是 map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是 map.put("type", 2); //消息类型 1=互动 2=公告 map.put("id", record.getId()); //对象ID JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/ if (tNotices.getIsBroadcast() == 1){ //增加极光推送 // JpushUtil.SendPushWithCustomForSh("DRIVER"+driver.getId().toString(),tNotices.getTitle(),"通知消息",null); } } } } } catch (Exception e) { e.printStackTrace(); } } } cloud-server-management/src/main/resources/mapper/AgreementMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/CancleOrderMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/CarServiceMapper.xml
@@ -9,14 +9,4 @@ <result column="type" property="type"/> <result column="serverCarModelId" property="serverCarModelId"/> </resultMap> <select id="query" resultType="CarService"> select id as id, carId as carId, `type` as `type`, serverCarModelId as serverCarModelId from t_car_service where `type` = #{type} and carId = #{carId} </select> </mapper> cloud-server-management/src/main/resources/mapper/DriverPunishMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/DriverVerifyMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/MenuMapper.xml
@@ -150,9 +150,7 @@ m1.url as url, m1.levels as levels, m1.ismenu as ismenu, m1.num as num, m1.ename ename, m1.bname bname m1.num as num FROM sys_menu m1 LEFT join sys_menu m2 ON m1.pcode = m2. CODE cloud-server-management/src/main/resources/mapper/PhoneMapper.xml
@@ -13,7 +13,7 @@ <select id="queryPhones" resultType="Phone"> <select id="queryPhones" resultType="com.dsh.course.entity.Phone"> select id as id, type as type, @@ -35,7 +35,7 @@ </select> <select id="query" resultType="Phone"> <select id="query" resultType="com.dsh.course.entity.Phone"> select id as id, type as type, @@ -66,7 +66,7 @@ </select> <select id="queryInfo" resultType="Phone"> <select id="queryInfo" resultType="com.dsh.course.entity.Phone"> select id as id, type as type, cloud-server-management/src/main/resources/mapper/PushOrderMapper.xml
@@ -14,7 +14,7 @@ </resultMap> <select id="querys" resultType="PushOrder"> <select id="querys" resultType="com.dsh.course.entity.PushOrder"> select id as id, companyId as companyId, cloud-server-management/src/main/resources/mapper/ServerCarModelMapper.xml
@@ -15,7 +15,7 @@ <select id="queryServerCarModel" resultType="ServerCarModel"> <select id="queryServerCarModel" resultType="com.dsh.course.entity.ServerCarModel"> select * from t_server_carmodel where state = 1 and `type` = #{type} </select> </mapper> cloud-server-management/src/main/resources/mapper/SysCouponActivityMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/SysCouponRecordMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/SysIntegralMapper.xml
@@ -12,7 +12,7 @@ <select id="query" resultType="SysIntegral"> <select id="query" resultType="com.dsh.course.entity.SysIntegral"> select * from t_sys_integral where companyId = #{companyId} </select> </mapper> cloud-server-management/src/main/resources/mapper/SysRedPacketRecordMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/SystemPriceMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TAgreementMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TAuditRecordMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TCarBrandMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TCarMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TCarModelMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TCarServiceMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TEnsureIncomeFoundationMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TEnsureIncomeRuleMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialTimeSoltMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TFeedbackMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TOpenCityBusinessMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TOpenCityMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TOrderEvaluateMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TPhoneMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TPopularizeCodeMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TProblemMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TRegionMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TServerCarmodelMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSysCancleOrderMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSysFaceDistinguishMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSysPushOrderMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSysReformistMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSysSensitiveWordsMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSystemNoticeMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSystemPriceMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TSystemPriceServiceMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TUserLargeCouponMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TVersionManagementMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TbBannerMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TbChatSetMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TbGuidePageMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TbHotAddressMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TbStartPageMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TbUserExitMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/TbVoiceMapper.xml
File was deleted cloud-server-management/src/main/resources/mapper/UserMapper.xml
@@ -8,7 +8,6 @@ <result column="avatar" property="avatar" /> <result column="account" property="account" /> <result column="password" property="password" /> <result column="passWordUpdate" property="passWordUpdate"/> <result column="salt" property="salt" /> <result column="name" property="name" /> <result column="birthday" property="birthday" /> @@ -33,7 +32,7 @@ id, account, name, birthday,password, sex, email, avatar, phone, roleid,salt, deptid, status, createtime, version,roleType,objectId createtime, version </sql> <select id="selectUsers" resultType="map"> @@ -69,7 +68,7 @@ #{userId} </update> <select id="getByAccount" resultType="user"> <select id="getByAccount" resultType="com.dsh.guns.modular.system.model.User"> select <include refid="Base_Column_List_With_Pwd" /> from sys_user where account = #{account} and status != 3 cloud-server-management/src/main/webapp/WEB-INF/view/404.html
@@ -7,7 +7,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>evmoto摩托 - 404 页面</title> <title>玩湃生活 - 404 页面</title> <link rel="shortcut icon" href="${ctxPath}/log.ico"> <link href="${ctxPath}/css/bootstrap.min.css?v=3.3.6" rel="stylesheet"> <link href="${ctxPath}/css/font-awesome.css?v=4.4.0" rel="stylesheet"> <link href="${ctxPath}/css/style.css?v=4.1.0" rel="stylesheet"> cloud-server-management/src/main/webapp/WEB-INF/view/common/_right.html
@@ -44,7 +44,7 @@ <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctxPath}/blackboard?type=${type}" frameborder="0" data-id="${ctxPath}/blackboard" seamless></iframe> </div> <div class="footer"> <div class="pull-right">© 2019-2021 <a href="#" onclick="return false" target="_blank">evmoto</a> <div class="pull-right">© 2019-2021 <a href="#" onclick="return false" target="_blank">playpai</a> </div> </div> </div> cloud-server-management/src/main/webapp/WEB-INF/view/index.html
@@ -4,7 +4,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="renderer" content="webkit"> <title>evmoto - homepage</title> <title>玩湃生活</title> <link rel="shortcut icon" href="${ctxPath}/log.ico"> <link href="${ctxPath}/css/bootstrap.min.css?v=3.3.6" rel="stylesheet"> <link href="${ctxPath}/css/font-awesome.min.css?v=4.4.0" rel="stylesheet"> cloud-server-management/src/main/webapp/WEB-INF/view/login.html
@@ -4,7 +4,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>evmoto - Login</title> <title>playpai - Login</title> <link rel="shortcut icon" href="${ctxPath}/log.ico"> <link href="${ctxPath}/css/bootstrap.min.css?v=3.3.6" rel="stylesheet"> @@ -47,6 +47,10 @@ -webkit-box-shadow: 0 0 0 1000px white inset; // 背景设为白色 -webkit-text-fill-color: #fff; // 字体颜色 } .right-align { text-align: right; height: 40px; } </style> </head> @@ -56,29 +60,28 @@ <img src="${ctxPath}/img/index4.png" style="width: 300px;height: 400px;z-index: 1000;border-radius: 10px"> <div style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;"> <div style="position: relative; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;"> <div style="max-height: 100%"> <h3 style="color: black;"><img src="${ctxPath}/img/logo.png" width="30px" height="30px"/> evmoto Admin site</h3> <h3 style="color: black;"><img src="${ctxPath}/img/logo.png" width="30px" height="30px"/> Play pai site</h3> <br/> <h4 style="color: red;">${tips!}</h4> <form class="m-t" role="form" action="${ctxPath}/login" method="post"> <div class="item"> <img src="${ctxPath}/img/account.png" /> <input class="itemInput" type="text" name="username" id="username" placeholder="Please enter account" required="" value=""> <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value=""> </div> <div class="item"> <img src="${ctxPath}/img/password.png" /> <input class="itemInput" type="password" name="password" id="password" placeholder="Please enter password" required="" value=""> <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value=""> </div> <div class="item"> <label>language</label> <select name="language" id="language" class="itemInput"> <option value="1">中文</option> <option value="2">english</option> <option value="3">IndonesiaName</option> </select> <img src="${ctxPath}/img/password.png" /> <input class="itemInput" name="codes" id="codes" placeholder="请输入验证码" required="" value=""> </div> <button onclick="login()" class="btn full-width m-b" style="background-color: #0573EA;color: white;">Login</button> <div class="right-align"> <a style="color: #00b7ee" href="#">修改密码</a> </div> <button onclick="login()" class="btn full-width m-b" style="background-color: #db9f24;color: white;">登录</button> <button type="submit" id="submit" style="display: none;"></button> </p> </form> cloud-server-management/src/main/webapp/WEB-INF/view/system/log/log.html
@@ -25,9 +25,7 @@ </div> <div class="hidden-xs" id="OptLogTableToolbar" role="group"> <#button name="查看详情" icon="fa-plus" clickFun="OptLog.detail()"/> @if(shiro.hasPermission("/log/delLog")){ <#button name="清空日志" icon="fa-plus" clickFun="OptLog.delLog()" space="true"/> @} </div> <#table id="OptLogTable"/> </div> cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
New file @@ -0,0 +1,72 @@ @layout("/common/_container.html"){ <div class="row"> <div class="col-sm-12"> <div class="ibox float-e-margins"> <div class="ibox-title"> <h5>赛事管理</h5> </div> <div class="ibox-content"> <div class="row row-lg"> <div class="col-sm-12"> <div class="row"> <div class="col-sm-3"> </div> <div class="col-sm-3"> </div> <div class="col-sm-3"> <#NameCon id="shopName" name="门店名称" /> </div> <div class="col-sm-3"> <#NameCon id="eventName" name="赛事名称" /> </div> <div class="col-sm-3"> <#TimeCon id="createTime" name="时间" isTime="false"/> </div> <div class="col-sm-3"> <#SelectCon id="state" name="状态" > <option value="">全部</option> <option value="1">未开始</option> <option value="2">已开始</option> <option value="3">已结束</option> <option value="4">已取消</option> </#SelectCon> </div> <div class="col-sm-3"> <#SelectCon id="registerCondition" name="报名条件" > <option value="">全部</option> <option value="1">全部用户</option> <option value="2">仅限年度会员参与</option> <option value="3">仅限学员参与</option> </#SelectCon> </div> <div class="col-sm-3"> <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/> <#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/> </div> </div> <div class="hidden-xs" id="TCarTableToolbar" role="group"> <#button name="添加" icon="fa-plus" clickFun="TCar.openAddTCar()"/> <#button name="编辑" icon="fa-edit" clickFun="TCar.openTCarDetail()" space="true"/> <#button name="取消" icon="fa-remove" clickFun="TCar.delete()" space="true"/> <#button name="查看详情" icon="fa-remove" clickFun="TCar.delete()" space="true"/> <#button name="已报名人员" icon="fa-remove" clickFun="TCar.delete()" space="true"/> </div> <#table id="TCarTable"/> </div> </div> </div> </div> </div> </div> <script src="${ctxPath}/modular/system/tCompetition/tCompetition.js"></script> <script> laydate.render({ elem: '#createTime' ,range: true ,lang:"en" }); </script> @} cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
New file @@ -0,0 +1,381 @@ @layout("/common/_container.html"){ <div class="ibox float-e-margins"> <div class="ibox-content"> <div class="form-horizontal" id="carInfoForm"> <input type="hidden" id="roleType" name="roleType" value="${roleType}"> <input hidden id="language" value="${language}"> @if(language==1){ <div class="row"> <div class="col-sm-11"> <div class="form-group"> <label class="col-sm-3 control-label">所属机构：</label> <div class="col-sm-9" style="display: flex;align-items: center;"> @if(roleType == 1){ <div class="radio radio-info radio-inline"> <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)"> <label for="companyType1"> 平台车辆 </label> </div> <div class="radio radio-success radio-inline"> <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)"> <label for="companyTyp2"> 加盟车辆 </label> </div> <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;"> <option value="">选择所属分公司</option> @for(obj in companyList!){ <option value="${obj.id}">${obj.name}</option> @} </select> <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;"> <option value="">选择所属加盟商</option> </select> @}else if(roleType == 2){ <span class="control-label">${objectName!}</span> <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;"> <option value="">选择所属加盟商</option> @for(obj in franchiseeList!){ <option value="${obj.id}">${obj.name}</option> @} </select> @}else if(roleType == 3){ <span class="control-label">${objectName!}</span> @} </div> </div> <div class="form-group"> <fieldset> <label class="col-sm-3 control-label">服务模式：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> 摩托车 </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4"> <label for="serverBox4"> 同城快送 </label> </div> </div> </fieldset> </div> <div class="form-group" style="display: none;" id="zcModelDiv"> <label class="col-sm-3 control-label">摩托车车型：</label> <div class="col-sm-9"> <select class="form-control" id="zcModel" name="zcModel"> <option value="">选择车型</option> @for(obj in zcModelList){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <div class="form-group" style="display: none;" id="kcModelDiv"> <label class="col-sm-3 control-label">同城快送车型：</label> <div class="col-sm-9"> <select class="form-control" id="kcModel" name="kcModel"> <option value="">选择车型</option> @for(obj in kcModelList){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">选择车辆品牌</option> @for(obj in brandList){ <option value="${obj.id}">${obj.name}</option> @} </#select> <#select id="carModelId" name="车辆类型："> <option value="">选择车辆类型</option> </#select> <#select id="carColor" name="车辆颜色："> <option value="">选择车辆颜色</option> <option value="1">黑色</option> <option value="2">银色</option> <option value="3">白色</option> <option value="4">红色</option> <option value="5">黄色</option> <option value="6">橙色</option> <option value="7">蓝色</option> </#select> <#input id="carLicensePlate" name="车牌号" /> <#avatar id="carPhoto" name="车辆照片：" /> <#input id="drivingLicenseNumber" name="行驶证编号" /> <#avatar id="drivingLicensePhoto" name="行驶证照片：" /> <#input id="annualInspectionTime" name="年检到期时间" type="text"/> <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text"/> </div> </div> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/> <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/> </div> </div> @} @if(language==2){ <div class="row"> <div class="col-sm-11"> <div class="form-group"> <label class="col-sm-3 control-label">Affiliated organization：</label> <div class="col-sm-9" style="display: flex;align-items: center;"> @if(roleType == 1){ <div class="radio radio-info radio-inline"> <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)"> <label for="companyType1"> Platform vehicle </label> </div> <div class="radio radio-success radio-inline"> <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)"> <label for="companyTyp2"> Franchised vehicles </label> </div> <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;"> <option value="">Select Branch</option> @for(obj in companyList!){ <option value="${obj.id}">${obj.name}</option> @} </select> <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;"> <option value="">Select the franchisee</option> </select> @}else if(roleType == 2){ <span class="control-label">${objectName!}</span> <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;"> <option value="">Select the franchisee</option> @for(obj in franchiseeList!){ <option value="${obj.id}">${obj.name}</option> @} </select> @}else if(roleType == 3){ <span class="control-label">${objectName!}</span> @} </div> </div> <div class="form-group"> <fieldset> <label class="col-sm-3 control-label">Service mode：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> motorcycle </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4"> <label for="serverBox4"> Intra-city express delivery </label> </div> </div> </fieldset> </div> <div class="form-group" style="display: none;" id="zcModelDiv"> <label class="col-sm-3 control-label">Motorcycle model：</label> <div class="col-sm-9"> <select class="form-control" id="zcModel" name="zcModel"> <option value="">Select vehicle type</option> @for(obj in zcModelList){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <div class="form-group" style="display: none;" id="kcModelDiv"> <label class="col-sm-3 control-label">Local express delivery model：</label> <div class="col-sm-9"> <select class="form-control" id="kcModel" name="kcModel"> <option value="">Select vehicle type</option> @for(obj in kcModelList){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <#select id="carBrandId" name="Vehicle brand：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">Select vehicle brand</option> @for(obj in brandList){ <option value="${obj.id}">${obj.name}</option> @} </#select> <#select id="carModelId" name="Vehicle type："> <option value="">Vehicle type</option> </#select> <#select id="carColor" name="Vehicle color："> <option value="">Select vehicle color</option> <option value="1">black</option> <option value="2">silvery</option> <option value="3">white</option> <option value="4">red</option> <option value="5">yellow</option> <option value="6">orange</option> <option value="7">blue</option> </#select> <#input id="carLicensePlate" name="License plate number" /> <#avatar id="carPhoto" name="Vehicle photos：" /> <#input id="drivingLicenseNumber" name="Driving license number" /> <#avatar id="drivingLicensePhoto" name="Photo of driving license：" /> <#input id="annualInspectionTime" name="Annual inspection expiration time" type="text"/> <#input id="commercialInsuranceTime" name="Expiration time of commercial insurance" type="text"/> </div> </div> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/> <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/> </div> </div> @} @if(language==3){ <div class="row"> <div class="col-sm-11"> <div class="form-group"> <label class="col-sm-3 control-label">Organisasi Afiliasi：</label> <div class="col-sm-9" style="display: flex;align-items: center;"> @if(roleType == 1){ <div class="radio radio-info radio-inline"> <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)"> <label for="companyType1"> Kendaraan platform </label> </div> <div class="radio radio-success radio-inline"> <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)"> <label for="companyTyp2"> Kendaraan waralaba </label> </div> <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;"> <option value="">Pilih Branch</option> @for(obj in companyList!){ <option value="${obj.id}">${obj.name}</option> @} </select> <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;"> <option value="">Pilih pemilik franchise</option> </select> @}else if(roleType == 2){ <span class="control-label">${objectName!}</span> <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;"> <option value="">Pilih pemilik franchise</option> @for(obj in franchiseeList!){ <option value="${obj.id}">${obj.name}</option> @} </select> @}else if(roleType == 3){ <span class="control-label">${objectName!}</span> @} </div> </div> <div class="form-group"> <fieldset> <label class="col-sm-3 control-label">Mode Layanan：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> sepeda motor </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4"> <label for="serverBox4"> Pengiriman Ekspres Dalam Kota </label> </div> </div> </fieldset> </div> <div class="form-group" style="display: none;" id="zcModelDiv"> <label class="col-sm-3 control-label">Pengaturan model sepeda motor：</label> <div class="col-sm-9"> <select class="form-control" id="zcModel" name="zcModel"> <option value="">Pilih Jenis Kendaraan</option> @for(obj in zcModelList){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <div class="form-group" style="display: none;" id="kcModelDiv"> <label class="col-sm-3 control-label">Model pengiriman ekspres lokal：</label> <div class="col-sm-9"> <select class="form-control" id="kcModel" name="kcModel"> <option value="">Pilih Jenis Kendaraan</option> @for(obj in kcModelList){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <#select id="carBrandId" name="Merek kendaraan：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">Pilih Merek Kendaraan</option> @for(obj in brandList){ <option value="${obj.id}">${obj.name}</option> @} </#select> <#select id="carModelId" name="Jenis Kendaraan："> <option value="">Pilih Jenis Kendaraan</option> </#select> <#select id="carColor" name="Warna kendaraan："> <option value="">Pilih Warna Kendaraan</option> <option value="1">hitam</option> <option value="2">perak</option> <option value="3">putih</option> <option value="4">merah</option> <option value="5">kuning</option> <option value="6">oranye</option> <option value="7">biru</option> </#select> <#input id="carLicensePlate" name="车牌号" /> <#avatar id="carPhoto" name="Nomor SIM Mengemudi：" /> <#input id="drivingLicenseNumber" name="Nomor SIM Mengemudi" /> <#avatar id="drivingLicensePhoto" name="Foto SIM：" /> <#input id="annualInspectionTime" name="Waktu Kedaluwarsa Inspeksi Tahunan" type="text"/> <#input id="commercialInsuranceTime" name="Waktu kedaluwarsa asuransi komersial" type="text"/> </div> </div> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/> <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/> </div> </div> @} </div> </div> </div> <script src="${ctxPath}/modular/system/tCar/tCar_info.js"></script> <script> laydate.render({ elem: '#annualInspectionTime' ,lang:"en" }); laydate.render({ elem: '#commercialInsuranceTime' ,lang:"en" }); laydate.render({ elem: '#certifyDateA' ,lang:"en" }); laydate.render({ elem: '#transDateStart' ,lang:"en" }); laydate.render({ elem: '#transDateStop' ,lang:"en" }); laydate.render({ elem: '#certifyDateB' ,lang:"en" }); laydate.render({ elem: '#nextFixDate' ,lang:"en" }); laydate.render({ elem: '#GPSInstallDate' ,lang:"en" }); laydate.render({ elem: '#registerDate' ,lang:"en" }); </script> @} cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
New file @@ -0,0 +1,401 @@ @layout("/common/_container.html"){ <div class="ibox float-e-margins"> <div class="ibox-content"> <div class="form-horizontal" id="carInfoForm"> <input type="hidden" id="id" name="id" value="${item.id}"> <input hidden id="language" value="${language}"> <input type="hidden" id="roleType" name="roleType" value="${roleType}"> @if(language==1){ <div class="row"> <div class="col-sm-11"> <div class="form-group"> <label class="col-sm-3 control-label">所属机构：</label> <div class="col-sm-9" style="display: flex;align-items: center;"> @if(roleType == 1){ <div class="radio radio-info radio-inline"> <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)"> <label for="companyType1"> 平台车辆 </label> </div> <div class="radio radio-success radio-inline"> <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)"> <label for="companyTyp2"> 加盟车辆 </label> </div> <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px"> <option value="">选择所属分公司</option> @for(obj in companyList!){ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;"> <option value="">选择所属加盟商</option> @for(obj in franchiseeList!){ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> @}else if(roleType == 2){ <span class="control-label">${objectName!}</span> <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;"> <option value="">选择所属加盟商</option> @for(obj in franchiseeList!){ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> @}else if(roleType == 3){ <span class="control-label">${objectName!}</span> @} </div> </div> <div class="form-group"> <fieldset> <label class="col-sm-3 control-label">服务模式：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> 摩托车 </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}> <label for="serverBox4"> 同城快送 </label> </div> </div> </fieldset> </div> <div class="form-group" id="zcModelDiv"> <label class="col-sm-3 control-label">摩托车车型：</label> <div class="col-sm-9"> <select class="form-control" id="zcModel" name="zcModel"> <option value="">选择车型</option> @for(obj in zcModelList){ <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> </div> <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">选择车辆品牌</option> @for(obj in brandList){ <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option> @} </#select> <#select id="carModelId" name="车辆类型："> <option value="">选择车辆类型</option> @for(obj in modelList){ <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option> @} </#select> <#select id="carColor" name="车辆颜色："> <option value="">选择车辆颜色</option> <option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>黑色</option> <option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>银色</option> <option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>白色</option> <option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>红色</option> <option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>黄色</option> <option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>橙色</option> <option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>蓝色</option> </#select> <#input id="carLicensePlate" name="车牌号" value="${item.carLicensePlate}"/> <#avatar id="carPhoto" name="车辆照片：" avatarImg="${item.carPhoto}"/> <#input id="drivingLicenseNumber" name="行驶证编号" value="${item.drivingLicenseNumber}"/> <#avatar id="drivingLicensePhoto" name="行驶证照片：" avatarImg="${item.drivingLicensePhoto}"/> <#input id="annualInspectionTime" name="年检到期时间" type="text" value="${item.annualInspectionTime}"/> <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text" value="${item.commercialInsuranceTime}"/> </div> </div> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/> <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/> </div> </div> @} @if(language==2){ <div class="row"> <div class="col-sm-11"> <div class="form-group"> <label class="col-sm-3 control-label">Affiliated organization：</label> <div class="col-sm-9" style="display: flex;align-items: center;"> @if(roleType == 1){ <div class="radio radio-info radio-inline"> <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)"> <label for="companyType1"> Platform vehicle </label> </div> <div class="radio radio-success radio-inline"> <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)"> <label for="companyTyp2"> Franchised vehicles </label> </div> <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px"> <option value="">Select Branch</option> @for(obj in companyList!){ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;"> <option value="">Select the franchisee</option> @for(obj in franchiseeList!){ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> @}else if(roleType == 2){ <span class="control-label">${objectName!}</span> <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;"> <option value="">Select the franchisee</option> @for(obj in franchiseeList!){ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> @}else if(roleType == 3){ <span class="control-label">${objectName!}</span> @} </div> </div> <div class="form-group"> <fieldset> <label class="col-sm-3 control-label">Service mode：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> motorcycle </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}> <label for="serverBox4"> Intra-city express delivery </label> </div> </div> </fieldset> </div> <div class="form-group" id="zcModelDiv"> <label class="col-sm-3 control-label">Motorcycle model setting：</label> <div class="col-sm-9"> <select class="form-control" id="zcModel" name="zcModel"> <option value="">Select vehicle type</option> @for(obj in zcModelList){ <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> </div> <div class="form-group" id="kcModelDiv"> <label class="col-sm-3 control-label">Cross city travel model：</label> <div class="col-sm-9"> <select class="form-control" id="kcModel" name="kcModel"> <option value="">Select vehicle type</option> @for(obj in kcModelList){ <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> </div> <#select id="carBrandId" name="Vehicle brand：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">Select vehicle brand</option> @for(obj in brandList){ <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option> @} </#select> <#select id="carModelId" name="Vehicle type："> <option value="">Select vehicle type</option> @for(obj in modelList){ <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option> @} </#select> <#select id="carColor" name="Vehicle color："> <option value="">Select vehicle color</option> <option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>black</option> <option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>silvery</option> <option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>white</option> <option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>red</option> <option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>yellow</option> <option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>orange</option> <option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>blue</option> </#select> <#input id="carLicensePlate" name="License plate number" value="${item.carLicensePlate}"/> <#avatar id="carPhoto" name="Vehicle photos：" avatarImg="${item.carPhoto}"/> <#input id="drivingLicenseNumber" name="Driving license number" value="${item.drivingLicenseNumber}"/> <#avatar id="drivingLicensePhoto" name="Photo of driving license：" avatarImg="${item.drivingLicensePhoto}"/> <#input id="annualInspectionTime" name="Annual inspection expiration time" type="text" value="${item.annualInspectionTime}"/> <#input id="commercialInsuranceTime" name="Expiration time of commercial insurance" type="text" value="${item.commercialInsuranceTime}"/> </div> </div> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/> <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/> </div> </div> @} @if(language==3){ <div class="row"> <div class="col-sm-11"> <div class="form-group"> <label class="col-sm-3 control-label">Organisasi Afiliasi：</label> <div class="col-sm-9" style="display: flex;align-items: center;"> @if(roleType == 1){ <div class="radio radio-info radio-inline"> <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)"> <label for="companyType1"> Kendaraan platform </label> </div> <div class="radio radio-success radio-inline"> <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)"> <label for="companyTyp2"> Kendaraan waralaba </label> </div> <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px"> <option value="">Pilih Branch</option> @for(obj in companyList!){ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;"> <option value="">Pilih pemilik franchise</option> @for(obj in franchiseeList!){ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> @}else if(roleType == 2){ <span class="control-label">${objectName!}</span> <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;"> <option value="">Pilih pemilik franchise</option> @for(obj in franchiseeList!){ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option> @} </select> @}else if(roleType == 3){ <span class="control-label">${objectName!}</span> @} </div> </div> <div class="form-group"> <fieldset> <label class="col-sm-3 control-label">Mode Layanan：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> sepeda motor </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}> <label for="serverBox4"> Pengiriman Ekspres Dalam Kota </label> </div> </div> </fieldset> </div> <div class="form-group" id="zcModelDiv"> <label class="col-sm-3 control-label">Pengaturan model sepeda motor：</label> <div class="col-sm-9"> <select class="form-control" id="zcModel" name="zcModel"> <option value="">Pilih Jenis Kendaraan</option> @for(obj in zcModelList){ <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> </div> <div class="form-group" id="kcModelDiv"> <label class="col-sm-3 control-label">Model perjalanan melintasi kota：</label> <div class="col-sm-9"> <select class="form-control" id="kcModel" name="kcModel"> <option value="">Pilih Jenis Kendaraan</option> @for(obj in kcModelList){ <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> </div> <#select id="carBrandId" name="Merek kendaraan：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">Pilih Merek Kendaraan</option> @for(obj in brandList){ <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option> @} </#select> <#select id="carModelId" name="Jenis Kendaraan："> <option value="">Pilih Jenis Kendaraan</option> @for(obj in modelList){ <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option> @} </#select> <#select id="carColor" name="车辆颜色："> <option value="">选择车辆颜色</option> <option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>hitam</option> <option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>perak</option> <option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>putih</option> <option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>merah</option> <option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>kuning</option> <option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>oranye</option> <option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>biru</option> </#select> <#input id="carLicensePlate" name="Nomor plat nomor" value="${item.carLicensePlate}"/> <#avatar id="carPhoto" name="Foto kendaraan：" avatarImg="${item.carPhoto}"/> <#input id="drivingLicenseNumber" name="Nomor SIM Mengemudi" value="${item.drivingLicenseNumber}"/> <#avatar id="drivingLicensePhoto" name="Foto SIM：" avatarImg="${item.drivingLicensePhoto}"/> <#input id="annualInspectionTime" name="Waktu Kedaluwarsa Inspeksi Tahunan" type="text" value="${item.annualInspectionTime}"/> <#input id="commercialInsuranceTime" name="Waktu kedaluwarsa asuransi komersial" type="text" value="${item.commercialInsuranceTime}"/> </div> </div> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/> <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/> </div> </div> @} </div> </div> </div> <script src="${ctxPath}/modular/system/tCar/tCar_info.js"></script> <script> laydate.render({ elem: '#annualInspectionTime' ,lang:"en" }); laydate.render({ elem: '#commercialInsuranceTime' ,lang:"en" }); laydate.render({ elem: '#certifyDateA' ,lang:"en" }); laydate.render({ elem: '#transDateStart' ,lang:"en" }); laydate.render({ elem: '#transDateStop' ,lang:"en" }); laydate.render({ elem: '#certifyDateB' ,lang:"en" }); laydate.render({ elem: '#nextFixDate' ,lang:"en" }); laydate.render({ elem: '#GPSInstallDate' ,lang:"en" }); laydate.render({ elem: '#registerDate' ,lang:"en" }); </script> <script type="application/javascript"> $(function() { var companyType = $("input[name='companyType']:checked").val(); if (1 == companyType){ $(".companyDiv").hide(); } else if (2 == companyType){ $(".companyDiv").show(); } TCarInfoDlg.zcServerClick(); TCarInfoDlg.kcServerClick(); }); </script> @} cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
New file @@ -0,0 +1,315 @@ /** * 车辆管理管理初始化 */ var TCar = { id: "TCarTable", //表格id seItem: null, //选中的条目 table: null, layerIndex: -1 }; var language =1 /** * 初始化表格的列 */ TCar.initColumn = function () { return [ {field: 'selectItem', radio: true}, {title: '所在省', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'8%', }, {title: '所在市', field: 'id', visible: true, align: 'center', valign: 'middle'}, {title: '举办门店', field: 'companyName', visible: true, align: 'center', valign: 'middle',width:'8%', }, {title: '赛事名称', field: 'brandName', visible: true, align: 'center', valign: 'middle',width:'8%', }, {title: '开始时间', field: 'modelName', visible: true, align: 'center', valign: 'middle',width:'8%', }, {title: '结束时间', field: 'carColor', visible: true, align: 'center', valign: 'middle',width:'5%', }, {title: '最大人数-已报名人数', field: 'serverStr', visible: true, align: 'center', valign: 'middle',width:'8%', }, {title: '报名条件', field: 'carLicensePlate', visible: true, align: 'center', valign: 'middle',width:'8%', }, ]; }; function currentTime(timestamp){ var time = timestamp + ''; if(time.length != 13){ timestamp = timestamp * 1000; } var date = new Date(timestamp);; var Y = date.getFullYear() + '-'; var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' '; var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + ':'; var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + ':'; var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()); var strDate = Y + M + D + h + m + s; return strDate } function currentTime1(timestamp){ var time = timestamp + ''; if(time.length != 13){ timestamp = timestamp * 1000; } var date = new Date(timestamp);; var Y = date.getFullYear() + '-'; var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' '; var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + ':'; var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + ':'; var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()); var strDate = Y + M + D ; return strDate } /** * 检查是否选中 */ TCar.check = function () { var selected = $('#' + this.id).bootstrapTable('getSelections'); if(selected.length == 0){ Feng.info("请先选中表格中的某一记录！"); return false; }else{ TCar.seItem = selected[0]; return true; } }; /** * 点击添加车辆管理 */ TCar.openAddTCar = function () { var index = layer.open({ type: 2, title: '添加', area: ['100%', '100%'], //宽高 fix: false, //不固定 maxmin: true, content: Feng.ctxPath + '/tCar/tCar_add' }); this.layerIndex = index; }; /** * 打开查看车辆管理详情 */ TCar.openTCarDetail = function () { if (this.check()) { var index = layer.open({ type: 2, title:'编辑', area: ['100%', '100%'], //宽高 fix: false, //不固定 maxmin: true, content: Feng.ctxPath + '/tCar/tCar_update/' + TCar.seItem.id }); this.layerIndex = index; } }; /** * 删除车辆管理 */ TCar.delete = function () { if (this.check()) { var nickname = TCar.seItem.carLicensePlate; if (nickname == "" || nickname == null || nickname == undefined){ nickname = "该车辆"; }else{ nickname = "【"+nickname+"】"; } swal({ title: language==1?"您是否确认删除" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"), text: language==1?"请谨慎操作！":(language==2?' Please operate with caution!':'Harap beroperasi dengan hati -hati!'), type: "warning", showCancelButton: true, confirmButtonColor: "#DD6B55", confirmButtonText: language==1?"删除":(language==2?'Delete':'Hapus'), closeOnConfirm: true }, function () { var ajax = new $ax(Feng.ctxPath + "/tCar/delete", function (data) { if(language==1){ swal("删除成功", "您已经成功删除了" + nickname + "。", "success"); }else if(language==2){ swal("Delete succeeded!", "You have successfully deleted it" + nickname + "。", "success"); }else { swal("Hapus berhasil!", "Anda berhasil menghapus" + nickname + "。", "success"); } TCar.table.refresh(); }, function (data) { if(language==1){ swal("删除失败", data.responseJSON.message + "！", "warning"); }else if(language==2){ swal("Failed to delete", data.responseJSON.message + "！", "warning"); }else { swal("Hapus Gagal", data.responseJSON.message + "！", "warning"); } }); ajax.set("tCarId",TCar.seItem.id); ajax.start(); }); } }; TCar.carInsurance = function () { if (this.check()) { var index = layer.open({ type: 2, title: language==1?'车辆保险':(language==2?'Vehicle insurance':'Asuransi kendaraan'), area: ['100%', '100%'], //宽高 fix: false, //不固定 maxmin: true, content: Feng.ctxPath + '/tCar/carInsurance?carId=' + TCar.seItem.id }); this.layerIndex = index; } }; /** * 查询车辆管理列表 */ TCar.search = function () { var queryData = {}; queryData['createTime'] = $("#createTime").val(); queryData['id'] = $("#id").val(); queryData['brandName'] = $("#brandName").val(); queryData['modelName'] = $("#modelName").val(); queryData['carColor'] = $("#carColor").val(); queryData['serverStr'] = $("#serverStr").val(); queryData['carLicensePlate'] = $("#carLicensePlate").val(); queryData['driverName'] = $("#driverName").val(); queryData['companyName'] = $("#companyName").val(); queryData['franchiseeName'] = $("#franchiseeName").val(); TCar.table.refresh({query: queryData}); }; TCar.resetSearch = function () { $("#createTime").val(""); $("#id").val(""); $("#brandName").val(""); $("#modelName").val(""); $("#carColor").val(""); $("#serverStr").val(""); $("#carLicensePlate").val(""); $("#driverName").val(""); $("#companyName").val(""); $("#franchiseeName").val(""); TCar.search(); }; $(function () { var defaultColunms = TCar.initColumn(); var table = new BSTable(TCar.id, "/tCar/list", defaultColunms); table.setPaginationType("server"); TCar.table = table.init(); }); /** * 下载模板 */ TCar.uploadCarModel = function () { window.location.href = Feng.ctxPath + "/tCar/uploadCarModel"; } var agreement = function(){ this.init = function(){ //模拟上传excel $("#uploadEventBtn").unbind("click").bind("click",function(){ $("#uploadEventFile").click(); }); }; } /** * 导入合同 */ TCar.exportCar = function () { var uploadEventFile = $("#uploadEventFile").val(); if(uploadEventFile == ''){ if(language==1){ Feng.info("请选择Excel,再上传"); }else if(language==2){ Feng.info("Please select Excel and upload"); }else { Feng.info("Silakan pilih Excel dan upload"); } }else if(uploadEventFile.lastIndexOf(".xls")<0){//可判断以.xls和.xlsx结尾的excel if(language==1){ Feng.info("只能上传Excel文件"); }else if(language==2){ Feng.info("Only Excel files can be uploaded"); }else { Feng.info("Hanya berkas Excel yang dapat diunggah"); } }else{ var url = Feng.ctxPath + '/tCar/exportCar'; var file = document.querySelector('input[name=file]').files[0]; var reader = new FileReader(); if (file) { var formData = new FormData(); formData.append("myfile", file); this.sendAjaxRequest(url, 'POST', formData); } } } TCar.sendAjaxRequest = function(url,type,data){ $.ajax({ url : url, type : type, data : data, success : function(result) { if(result.code==500) { Feng.info(result.message); }else { if(language==1){ Feng.success("导入成功!"); }else if(language==2){ Feng.success("SUCCESSFUL IMPORT!"); }else { Feng.success("Import berhasil!"); } } TCar.table.refresh(); }, error : function() { if(language==1){ Feng.error("excel上传失败!"); }else if(language==2){ Feng.error("Uploading excel Fails. Procedure!"); }else { Feng.error("Gagal mengunggah excel!"); } }, cache : false, contentType : false, processData : false }); }; var agreement; $(function(){ agreement = new agreement(); agreement.init(); }); /** * 导出车辆操作 */ TCar.outCar = function () { var operation = function() { window.location.href = Feng.ctxPath + "/tCar/outCar"; }; if(language==1){ Feng.confirm("是否确认导出车辆信息?", operation); }else if(language==2){ Feng.confirm("Are you sure to export vehicle information?", operation); }else { Feng.confirm("Apakah Anda pasti akan mengekspor informasi kendaraan?", operation); } } cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
New file @@ -0,0 +1,473 @@ /** * 初始化车辆管理详情对话框 */ var language=$("#language").val(); var TCarInfoDlg = { tCarInfoData : {}, validateFields: { carBrandId: { validators: { notEmpty: { message: language==1?'请选择车辆品牌':(language==2?"Please select the vehicle brand":"Silakan pilih tanda kendaraan") } } }, carModelId: { validators: { notEmpty: { message: language==1?'请选择车辆类型':(language==2?"Please select the vehicle type":"Silakan pilih tipe kendaraan") } } }, zcModel: { validators: { notEmpty: { message: language==1?'请选择摩托车车型':(language==2?"Please select a motorcycle model":"Silakan pilih model motor") } } }, carColor: { validators: { notEmpty: { message: language==1?'车辆颜色不能为空':(language==2?"The vehicle color cannot be empty.":"Warna kendaraan tidak bisa kosong.") } } }, drivingLicenseNumber: { validators: { notEmpty: { message: language==1?'行驶证编号不能为空':(language==2?"The driving license number cannot be empty":"Nomor SIM Tidak Bisa Kosong") } } }, annualInspectionTime: { validators: { notEmpty: { message: language==1?'年检到期时间不能为空':(language==2?"The annual inspection expiration time cannot be empty":"Waktu kedaluwarsa inspeksi tahunan tidak bisa kosong") } } }, commercialInsuranceTime: { validators: { notEmpty: { message: language==1?'商业保险到期时间不能为空':(language==2?"The commercial insurance expiration time cannot be empty":"Waktu kedaluwarsa asuransi komersial tidak bisa kosong") } } } } }; /** * 验证数据是否为空 */ TCarInfoDlg.validate = function () { $('#carInfoForm').data("bootstrapValidator").resetForm(); $('#carInfoForm').bootstrapValidator('validate'); return $("#carInfoForm").data('bootstrapValidator').isValid(); }; /** * 清除数据 */ TCarInfoDlg.clearData = function() { this.tCarInfoData = {}; } /** * 设置对话框中的数据 * * @param key 数据的名称 * @param val 数据的具体值 */ TCarInfoDlg.set = function(key, val) { this.tCarInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val; return this; } /** * 设置对话框中的数据 * * @param key 数据的名称 * @param val 数据的具体值 */ TCarInfoDlg.get = function(key) { return $("#" + key).val(); } /** * 关闭此对话框 */ TCarInfoDlg.close = function() { parent.layer.close(window.parent.TCar.layerIndex); } /** * 收集数据 */ TCarInfoDlg.collectData = function() { this .set('id') .set('isPlatCar') .set('companyId') .set('franchiseeId') .set('carColor') .set('carModelId') .set('carBrandId') .set('carLicensePlate') .set('carPhoto') .set('drivingLicenseNumber') .set('drivingLicensePhoto') .set('annualInspectionTime') .set('commercialInsuranceTime') .set('createTime') .set('state') .set('addType') .set('addObjectId') .set('plateColor') .set('vehicleType') .set('ownerName') .set('engineId') .set('VIN') .set('certifyDateA') .set('fuelType') .set('engineDisplace') .set('certificate') .set('transAgency') .set('transArea') .set('transDateStart') .set('transDateStop') .set('certifyDateB') .set('fixState') .set('nextFixDate') .set('checkState') .set('feePrintId') .set('GPSBrand') .set('GPSModel') .set('GPSIMEI') .set('GPSInstallDate') .set('registerDate') .set('commercialType'); } /** * 提交添加 */ TCarInfoDlg.addSubmit = function() { this.clearData(); this.collectData(); if(!this.validate()){ return ; } var roleType = $("#roleType").val(); //1=平台 2=分公司 3=加盟商 var companyType = $("input[name='companyType']:checked").val(); if (1 == roleType){ if (2 == companyType){ var oneId = $("#oneId").val(); if ("" == oneId){ if(language==1){ Feng.info("所属分公司不能为空!"); }else if(language==2){ Feng.info("The subordinate branch cannot be empty!"); }else { Feng.info("Cabang subordinat tidak dapat kosong!"); } return; } } } var serverBox =[]; $('input[name="serverBox"]:checked').each(function(){ serverBox.push($(this).val()); }); if (serverBox.length == 0){ if(language==1){ Feng.info("请选择经营业务"); }else if(language==2){ Feng.info("Please select business"); }else { Feng.info("Pilih bisnis"); } return; } var carPhoto = $("#carPhoto").valueOf(); if ("" == carPhoto){ if(language==1){ Feng.info("请上传车辆照片"); }else if(language==2){ Feng.info("Please upload a photo of the vehicle"); }else { Feng.info("Silakan mengunggah foto kendaraan"); } return; } var drivingLicensePhoto = $("#drivingLicensePhoto").valueOf(); if ("" == drivingLicensePhoto){ if(language==1){ Feng.info("请上传行驶证照片"); }else if(language==2){ Feng.info("Please upload a photo of your vehicle. Please upload a photo of your driving license"); }else { Feng.info("Silakan mengunggah foto kendaraanmu. Silakan mengunggah foto dari lisensi mengemudi Anda"); } return; } //提交信息 var ajax = new $ax(Feng.ctxPath + "/tCar/add", function(data){ if(data.status == 200){ if(language==1){ Feng.success("添加成功!"); }else if(language==2){ Feng.success("Successfully added!"); }else { Feng.success("Sangat berhasil ditambah!"); } window.parent.TCar.table.refresh(); TCarInfoDlg.close(); }else{ Feng.error(data.msg); } },function(data){ if(language==1){ Feng.error("添加失败!" + data.responseJSON.message + "!"); }else if(language==2){ Feng.error("Fail to add!" + data.responseJSON.message + "!"); }else { Feng.error("Gagal menambah!" + data.responseJSON.message + "!"); } }); ajax.set(this.tCarInfoData); ajax.set("serverBox",serverBox.toString()); ajax.set("zcModel",$("#zcModel").val()); ajax.set("kcModel",$("#kcModel").val()); ajax.set("roleType",roleType); if (1 == roleType){ ajax.set("companyType",companyType); ajax.set("oneId",$("#oneId").val()); ajax.set("twoId",$("#twoId").val()); ajax.set("franchiseeId",0); } else if (2 == roleType) { ajax.set("franchiseeId",$("#franchiseeId").val()); ajax.set("companyType",0); ajax.set("oneId",0); ajax.set("twoId",0); }else if (3 == roleType){ ajax.set("franchiseeId",0); ajax.set("companyType",0); ajax.set("oneId",0); ajax.set("twoId",0); } ajax.start(); } /** * 提交修改 */ TCarInfoDlg.editSubmit = function() { this.clearData(); this.collectData(); if(!this.validate()){ return ; } var roleType = $("#roleType").val(); //1=平台 2=分公司 3=加盟商 var companyType = $("input[name='companyType']:checked").val(); if (1 == roleType){ if (2 == companyType){ var oneId = $("#oneId").val(); if ("" == oneId){ if(language==1){ Feng.info("所属分公司不能为空!"); }else if(language==2){ Feng.info("The subordinate branch cannot be empty!"); }else { Feng.info("Cabang subordinat tidak dapat kosong!"); } return; } } } var serverBox =[]; $('input[name="serverBox"]:checked').each(function(){ serverBox.push($(this).val()); }); if (serverBox.length == 0){ if(language==1){ Feng.info("请选择经营业务"); }else if(language==2){ Feng.info("Please select business"); }else { Feng.info("Pilih bisnis"); } return; } var carPhoto = $("#carPhoto").valueOf(); if ("" == carPhoto){ if(language==1){ Feng.info("请上传车辆照片"); }else if(language==2){ Feng.info("Please upload a photo of the vehicle"); }else { Feng.info("Silakan mengunggah foto kendaraan"); } return; } var drivingLicensePhoto = $("#drivingLicensePhoto").valueOf(); if ("" == drivingLicensePhoto){ if(language==1){ Feng.info("请上传行驶证照片"); }else if(language==2){ Feng.info("Please upload a photo of your vehicle. Please upload a photo of your driving license"); }else { Feng.info("Silakan mengunggah foto kendaraanmu. Silakan mengunggah foto dari lisensi mengemudi Anda"); } return; } //提交信息 var ajax = new $ax(Feng.ctxPath + "/tCar/update", function(data){ if(data.status == 200){ if(language==1){ Feng.success("修改成功!"); }else if(language==2){ Feng.success("Modify successfully!"); }else { Feng.success("Mengubah dengan sukses!"); } window.parent.TCar.table.refresh(); TCarInfoDlg.close(); }else{ Feng.error(data.msg); } },function(data){ if(language==1){ Feng.error("修改失败!" + data.responseJSON.message + "!"); }else if(language==2){ Feng.error("Fail to modify!" + data.responseJSON.message + "!"); }else { Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");; } }); ajax.set(this.tCarInfoData); ajax.set("serverBox",serverBox.toString()); ajax.set("zcModel",$("#zcModel").val()); ajax.set("kcModel",$("#kcModel").val()); ajax.set("roleType",roleType); if (1 == roleType){ ajax.set("companyType",companyType); ajax.set("oneId",$("#oneId").val()); ajax.set("twoId",$("#twoId").val()); ajax.set("franchiseeId",0); } else if (2 == roleType) { ajax.set("franchiseeId",$("#franchiseeId").val()); ajax.set("companyType",0); ajax.set("oneId",0); ajax.set("twoId",0); }else if (3 == roleType){ ajax.set("franchiseeId",0); ajax.set("companyType",0); ajax.set("oneId",0); ajax.set("twoId",0); } ajax.start(); } $(function() { Feng.initValidator("carInfoForm", TCarInfoDlg.validateFields); // 初始化图片上传 var carPhoto = new $WebUpload("carPhoto"); carPhoto.setUploadBarId("progressBar"); carPhoto.init(); var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto"); drivingLicensePhoto.setUploadBarId("progressBar"); drivingLicensePhoto.init(); }); /** * 选择分公司后执行 */ TCarInfoDlg.oneChange = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tDriver/oneChange", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择所属加盟商</option>'; }else if(language==2){ var content='<option value="">Choose your franchisee</option>'; }else { var content='<option value="">Pilih franchisee Anda</option>'; } $.each(data, function(k,v) { content += "<option value='"+v.id+"'>"+v.name+"</option>"; }); $("#twoId").empty().append(content); } }); ajax.set("oneId",oneId); ajax.start(); } /** * 类型改变执行 * @param e */ TCarInfoDlg.companyTypeClick = function (e) { if (1 == e){ $(".companyDiv").hide(); } else if (2 == e){ $(".companyDiv").show(); } } /** * 车辆品牌改变时执行 */ TCarInfoDlg.brandChange = function (e) { var carBrandId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCar/brandChange", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择车辆类型</option>'; }else if(language==2){ var content='<option value="">Please select the vehicle type</option>'; }else { var content='<option value="">Pilih Jenis Kendaraan</option>'; } $.each(data, function(k,v) { content += "<option value='"+v.id+"'>"+v.name+"</option>"; }); $("#carModelId").empty().append(content); } }); ajax.set("carBrandId",carBrandId); ajax.start(); } /** * 专车服务被点击 */ TCarInfoDlg.zcServerClick = function () { var serverBox1 = $('#serverBox1').prop('checked'); if (serverBox1){ $("#zcModelDiv").show(); } else { $("#zcModelDiv").hide(); } } /** * 跨城服务被点击 */ TCarInfoDlg.kcServerClick = function () { var serverBox3 = $('#serverBox3').prop('checked'); if (serverBox3){ $("#kcModelDiv").show(); } else { $("#kcModelDiv").hide(); } } cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
@@ -40,13 +40,16 @@ StoredValueConfig storedValueConfig = svconfigService.list().get(0); try { ObjectMapper objectMapper = new ObjectMapper(); JsonNode rulesNode = objectMapper.readTree(storedValueConfig.getContent()).path("rules"); JsonNode rulesNode = objectMapper.readTree(storedValueConfig.getContent()).get("rules"); if (rulesNode.isArray()) { int i = 0; for (JsonNode ruleNode : rulesNode) { i = i + 1; Map<String,Object> de = new HashMap<>(); String money = ruleNode.get("money").asText(); String usersCoins = ruleNode.get("usersCoins").asText(); String MemberCoins = ruleNode.get("MemberCoins").asText(); de.put("chargeId",i); de.put("money",money); de.put("usersCoins",usersCoins); de.put("MemberCoins",MemberCoins); @@ -68,6 +71,7 @@ public ResultUtil<String> rechargeCenterConfig(){ try { StoredValueConfig storedValueConfig = svconfigService.list().get(0); System.out.println(svconfigService.list()); return ResultUtil.success(storedValueConfig.getDescription()); }catch (Exception e){ return ResultUtil.runErr();
