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(); @@ -215,7 +217,7 @@ @ResponseBody @PostMapping("/api/useBenefit/voucherCenter") @PostMapping("/base/useBenefit/voucherCenter") @ApiOperation(value = "充值中心", tags = {"APP-使用福利"}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), @@ -333,7 +335,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/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); /** * 注销账号 cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -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,12 +163,16 @@ 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())){ 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 { @@ -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
@@ -484,9 +484,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 +501,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 +512,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 +523,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 +534,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 +556,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 +570,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 +578,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 +595,7 @@ } }); } vo.setDetails(details); return vo; return details; } @Override @@ -617,6 +615,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")+""); 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/mapper/CarServiceMapper.java
@@ -7,5 +7,5 @@ public interface CarServiceMapper extends BaseMapper<CarService> { CarService query(@Param("type") Integer orderType, @Param("carId") Integer carId); // CarService query(@Param("type") Integer orderType, @Param("carId") Integer carId); } cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceServiceImpl.java
@@ -11,6 +11,6 @@ @Override public CarService query(Integer orderType, Integer carId) { return this.baseMapper.query(orderType, carId); return null; } } 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/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
@@ -69,7 +69,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-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();
