server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -115,7 +115,9 @@ REFUND(2,"结算退押金", "结算退押金"), PLATFORMREFUND(3,"平台退押金", "平台退押金") PLATFORM_REFUND(3,"平台退款", "平台退款"), DISCOUNT(4,"平台套餐", "平台套餐") ; String name; server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -2163,19 +2163,19 @@ /** * 得出两个日期之间的间隔天数 * * @param strFromDate * @param smallDate * 格式为yyyy-MM-dd * @param strToDate * @param bigDate * 格式为yyyy-MM-dd * @return int */ public static long getBetweenDays(String strFromDate, String strToDate) { public static long getBetweenDays(String smallDate, String bigDate) { long m_intervalday = 0;// 初始化时间间隔的值为0 // 使用的时间格式为yyyy-MM-dd SimpleDateFormat m_simpledateformat = new SimpleDateFormat("yyyy-MM-dd"); try { Date fromDate = m_simpledateformat.parse(strFromDate); Date toDate = m_simpledateformat.parse(strToDate); Date fromDate = m_simpledateformat.parse(smallDate); Date toDate = m_simpledateformat.parse(bigDate); m_intervalday = toDate.getTime() - fromDate.getTime();// 计算所得为微秒数 m_intervalday = m_intervalday / 1000 / 60 / 60 / 24;// 计算所得的天数 @@ -2771,8 +2771,7 @@ public static void main(String[] args) { try { System.out.println((int)(3.222)); System.out.println(DateUtil.getBetweenDays("2025-02-13","2025-02-15")); } catch (Exception ex) { ex.printStackTrace(); } server/services/src/main/java/com/doumee/dao/business/model/Discount.java
@@ -157,6 +157,12 @@ private Integer bikeOrElec; @TableField(exist = false) @ApiModelProperty(value = "每日单价", example = "1") private BigDecimal dayPrice; @TableField(exist = false) @ApiModelProperty(value = "图片全路径", example = "1") private String fullImgUrl; } server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
@@ -118,8 +118,8 @@ @ApiModelProperty(value = "销量每天限额", example = "1") private Integer saleDayLimit; @ApiModelProperty(value = "状态 0正常 1作废 2过期或用完", example = "1") @ExcelColumn(name="套餐状态",index = 7,width = 10,valueMapping = "0=正常；1=作废；2=过期或用完") @ApiModelProperty(value = "状态 0正常 1作废 2待支付", example = "1") @ExcelColumn(name="套餐状态",index = 7,width = 10,valueMapping = "0=正常；1=作废；2=待支付") private Integer status; @ApiModelProperty(value = "用户编码（关联member)") server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
@@ -63,7 +63,7 @@ @ExcelColumn(name="交易金额") private BigDecimal money; @ApiModelProperty(value = "交易类型 0租车押金 1结算实际消费 2结算退款 3平台退款", example = "1") @ApiModelProperty(value = "交易类型 0租车押金 1结算实际消费 2结算退款 3平台退款 4购买套餐 ", example = "1") @ExcelColumn(name="交易类型 0租车押金 1结算实际消费 2结算退款 3平台退款") private Integer type; @@ -91,8 +91,8 @@ @ExcelColumn(name="用户当前余额(分）") private BigDecimal balance; @ApiModelProperty(value = "交易关联对象类型 0订单 1退款单", example = "1") @ExcelColumn(name="交易关联对象类型 0订单 1退款单") @ApiModelProperty(value = "交易关联对象类型 0订单 1退款单 2套餐购买", example = "1") @ExcelColumn(name="交易关联对象类型 0订单 1退款单 2套餐购买") private Integer objType; @ApiModelProperty(value = "交易关联对象编码") server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
@@ -1,6 +1,7 @@ package com.doumee.dao.business.web.response; import com.doumee.dao.business.model.Ad; import com.doumee.dao.business.model.Discount; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,7 +38,6 @@ @ApiModelProperty(value = "租赁须知") private String leaseNotice; @ApiModelProperty(value = "押金状态：0=未支付押金；1=已支付押金; 2=退款中") private Integer depositStatus = 0; @@ -65,5 +65,7 @@ @ApiModelProperty(value = "广告信息") private List<Ad> adList; @ApiModelProperty(value = "热销套餐") private List<Discount> discountList; } server/services/src/main/java/com/doumee/service/business/DiscountService.java
@@ -87,6 +87,7 @@ */ PageData<Discount> findPage(PageWrap<Discount> pageWrap); void dealPrice(Discount discount); /** * 条件统计 * server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -128,9 +128,16 @@ */ Object createGoodsOrderPay(String memberId); /** * 套餐购买 * @param discountId * @param memberId * @return */ Object createDiscountOrderPay(String discountId,String memberId); /** * 押金支付回调业务 * 支付回调业务 * @param preOrderId * @return */ server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java
@@ -183,6 +183,7 @@ discountLog.setGoodsorderId(discountMember.getGoodsorderId()); discountLogMapper.insert(discountLog); } //退款操作 } @@ -229,8 +230,8 @@ discountLog.setGoodsorderId(discountMember.getGoodsorderId()); discountLog.setEditInfo(model.getInfo()); discountLog.setEditDays(model.getAddDays()); discountLog.setInfo("将有效期增加"+model.getAddDays()+"天, 调整后有效期至"+useEndDate); discountLogMapper.insert(discountLog); } }
@@ -7,6 +7,7 @@ import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.dao.business.DiscountMapper; import com.doumee.dao.business.join.BikeRepairJoinMapper; @@ -29,6 +30,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Objects; @@ -58,6 +60,9 @@ discount.setIsdeleted(Constants.ZERO); discount.setCreateDate(new Date()); discount.setCreator(userInfo.getId()); if(Constants.equalsInteger(discount.getUseType(),Constants.ZERO)){ discount.setUseDays((int) (DateUtil.getBetweenDays(DateUtil.dateToString(discount.getUseStartDate(),"yyyy-MM-dd"),DateUtil.dateToString(discount.getUseEndDate(),"yyyy-MM-dd")))); } discountMapper.insert(discount); return discount.getId(); } @@ -68,15 +73,15 @@ || StringUtils.isBlank(discount.getName()) || Objects.isNull(discount.getType()) || Objects.isNull(discount.getLimitType()) || (discount.getLimitTime()==Constants.ONE && Objects.isNull(discount.getLimitTime())) || Objects.isNull(discount.getPrice()) || (Constants.equalsInteger(discount.getLimitTime(),Constants.ONE) && Objects.isNull(discount.getLimitTime())) || Objects.isNull(discount.getPrice()) || discount.getPrice().compareTo(BigDecimal.ZERO) <= Constants.ZERO || Objects.isNull(discount.getChannel()) || Objects.isNull(discount.getStartDate()) || Objects.isNull(discount.getEndDate()) || Objects.isNull(discount.getUseType()) || (discount.getUseType()==Constants.ZERO && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseEndDate()) )) || (discount.getUseType()==Constants.ONE && Objects.isNull(discount.getUseDays())) || (discount.getUseType()==Constants.TWO && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseDays()) )) || (Constants.equalsInteger(discount.getUseType(),Constants.ZERO) && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseEndDate()) )) || (Constants.equalsInteger(discount.getUseType(),Constants.ONE) && Objects.isNull(discount.getUseDays())) || (Constants.equalsInteger(discount.getUseType(),Constants.TWO) && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseDays()) )) || (Objects.isNull(discount.getUseHoliday()) || Objects.isNull(discount.getUseWorkday()) ) || (Objects.isNull(discount.getIsbike()) || Objects.isNull(discount.getIselecbike()) ) ){ @@ -86,15 +91,16 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"销售时段信息错误"); } //固定日期生效 if(discount.getUseType()==Constants.ZERO && if(Constants.equalsInteger(discount.getUseType(),Constants.ZERO) && ( discount.getUseStartDate().getTime()>discount.getUseEndDate().getTime() || discount.getUseStartDate().getTime() < discount.getStartDate().getTime() || discount.getUseEndDate().getTime() > discount.getEndDate().getTime() ) ){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"使用时段信息错误"); } //指定日期生效 if(discount.getUseType()==Constants.TWO && if(Constants.equalsInteger(discount.getUseType(),Constants.TWO) && ( discount.getUseStartDate().getTime()<discount.getStartDate().getTime() || discount.getUseStartDate().getTime() > discount.getEndDate().getTime() ) ){ @@ -125,8 +131,6 @@ } discountMapper.update(null,new UpdateWrapper<Discount>().lambda().set(Discount::getStatus,discount.getStatus()).eq(Discount::getId,discount.getId())); } @Override @@ -168,6 +172,7 @@ if(Objects.isNull(discount)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } this.dealPrice(discount); if(StringUtils.isNotBlank(discount.getImgurl())){ String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.DISCOUNT).getCode(); @@ -203,10 +208,31 @@ .eq(Objects.nonNull(modele.getBikeOrElec()) && Constants.equalsInteger(modele.getBikeOrElec(),Constants.TWO),Discount::getIselecbike, Constants.ONE) .eq(Discount::getIsdeleted, Constants.ZERO) .eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus()); queryWrapper.orderByDesc(Discount::getCreateDate); return PageData.from(discountJoinMapper.selectJoinPage(page, Discount.class,queryWrapper)); queryWrapper.orderByDesc(Discount::getCreateDate); PageData<Discount> pageData = PageData.from(discountJoinMapper.selectJoinPage(page, Discount.class,queryWrapper)); for (Discount discount:pageData.getRecords()) { dealPrice(discount); } return pageData; } @Override public void dealPrice(Discount discount){ if(Objects.isNull(discount) || Objects.isNull(discount.getUseEndDate()) || Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getPrice()) || discount.getPrice().compareTo(BigDecimal.ZERO)==0 ){ discount.setDayPrice(BigDecimal.ZERO); return; } discount.setDayPrice(discount.getPrice().divide(new BigDecimal(Long.toString(discount.getUseDays())),2)); } @Override public long count(Discount discount) { QueryWrapper<Discount> wrapper = new QueryWrapper<>(discount); server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -49,6 +49,7 @@ import org.apache.shiro.SecurityUtils; import org.checkerframework.checker.units.qual.A; import org.checkerframework.checker.units.qual.C; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -82,6 +83,8 @@ @Autowired private DiscountLogMapper discountLogMapper; @Autowired private DiscountMapper discountMapper; @Autowired GoodsorderJoinMapper goodsorderJoinMapper; @@ -375,6 +378,19 @@ .eq("status",Constants.ZERO) .orderByAsc("sortnum") ));; homeResponse.setDiscountList( discountMapper.selectList(new QueryWrapper<Discount>().lambda() .eq(Discount::getIsdeleted,Constants.ZERO) .eq(Discount::getStatus,Constants.ZERO) .orderByDesc(Discount::getId) .last(" limit 3 ") ) ); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(homeResponse.getDiscountList())){ for (Discount discount:homeResponse.getDiscountList()) { discount.setDayPrice(discount.getPrice().divide(new BigDecimal(Integer.toString(discount.getUseDays())),2)); } } if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){ homeResponse.getAdList().forEach(i->{ i.setImgfullurl(fullPath + i.getImgurl()); @@ -1105,6 +1121,7 @@ goodsorder.setCreateDate(new Date()); goodsorder.setIsdeleted(Constants.ZERO); goodsorder.setCode(goodsorder.getId()); goodsorder.setType(Constants.ZERO); goodsorder.setMemberId(memberId); goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(new BigDecimal(100))); goodsorder.setStatus(Constants.goodsorderStatus.waitPay); @@ -1119,16 +1136,101 @@ } catch (Exception e) { throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，发起支付失败~"); } return response; } private Object getWxPayResponse(Goodsorder goodsorder,String openid) throws Exception { @Override public Object createDiscountOrderPay(String memberId,String discountId){ Member member = memberMapper.selectById(memberId); if(Objects.isNull(member)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到用户对象信息"); } Discount discount = discountMapper.selectById(discountId); this.checkDiscountSaleDate(discount); String discountMemberId = Constants.getUUID(); String goodsorderId = Constants.getUUID(); DiscountMember discountMember = new DiscountMember(); BeanUtils.copyProperties(discount,discountMember); discountMember.setCreator(null); discountMember.setId(discountMemberId); discountMember.setCreateDate(new Date()); discountMember.setEditDate(new Date()); discountMember.setEditor(null); discountMember.setMemberId(memberId); discountMember.setStatus(Constants.TWO); discountMember.setGoodsorderId(goodsorderId); discountMemberMapper.insert(discountMember); Goodsorder goodsorder = new Goodsorder(); goodsorder.setId(goodsorderId); goodsorder.setCreateDate(new Date()); goodsorder.setIsdeleted(Constants.ZERO); goodsorder.setCode(goodsorder.getId()); goodsorder.setMemberId(memberId); goodsorder.setType(Constants.ONE); goodsorder.setMoney(discount.getPrice().multiply(new BigDecimal(100))); goodsorder.setStatus(Constants.goodsorderStatus.waitPay); goodsorder.setPreOrderid(goodsorder.getId()); goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay); goodsorder.setPayWay(Constants.ZERO); goodsorder.setObjType(Constants.ZERO); goodsorder.setObjId(discount.getId()); this.goodsorderMapper.insert(goodsorder); //调起支付 Object response = null; Object response = null; try { response = getWxPayResponse(goodsorder,member.getOpenid()); } catch (Exception e) { throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，发起支付失败~"); } return response; } public void checkDiscountSaleDate(Discount discount){ if(Objects.isNull(discount)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到套餐信息"); } if(!(Constants.equalsInteger(discount.getIsdeleted(),Constants.ZERO) ||Constants.equalsInteger(discount.getStatus(),Constants.ZERO))){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"套餐已下架，无法进行购买，请刷新查看"); } if(!(discount.getStartDate().getTime() < System.currentTimeMillis() && Utils.Date.getEnd(discount.getEndDate()).getTime() > System.currentTimeMillis() )){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"套餐开放时间未到,无法进行购买"); } //验证是否超过今日可售卖数量 if(Objects.nonNull(discount.getSaleDayLimit())){ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda() .eq(Goodsorder::getType,Constants.ONE) .eq(Goodsorder::getObjId,discount.getId()) .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE) .apply(" EXTRACT(DAY FROM create_date) = EXTRACT(DAY FROM CURRENT_DATE) ") )>=discount.getSaleDayLimit()){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"套餐今日发行量已售罄，请明日查看！"); } } if(Objects.nonNull(discount.getSaleLimit())){ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda() .eq(Goodsorder::getType,Constants.ONE) .eq(Goodsorder::getObjId,discount.getId()) .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE) .apply(" EXTRACT(YEAR FROM create_date) = EXTRACT(YEAR FROM CURRENT_DATE) ") )>=discount.getSaleDayLimit()){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"套餐发行量已售罄！"); } } } private Object getWxPayResponse(Goodsorder goodsorder,String openid){ //调起支付 Object response = null; PrepayRequest request = new PrepayRequest(); request.setAttach("createGoodsOrder"); request.setDescription("森林公园自行车骑行押金支付"); request.setDescription(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)?"森林公园自行车骑行押金支付":"森林公园自行车购买骑行套餐支付"); request.setSpMchid(WxMiniConfig.wxProperties.getMchId()); request.setSpAppid(WxMiniConfig.wxProperties.getAppId()); request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId()); @@ -1145,10 +1247,10 @@ // 跟之前下单示例一样，填充预下单参数 PrepayWithRequestPaymentResponse resParam = WxMiniConfig.jsapiExtService.prepayWithRequestPayment(request,WxMiniConfig.wxProperties.getSubAppId()); response =resParam; return response; } /** @@ -1274,6 +1376,50 @@ return ("处理成功!"); } goodsorder.setOnlineOrderid(paymentNo); if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){ this.dealGoodsOrderCallBack(goodsorder); }else{ this.dealDiscountOrderCallBack(goodsorder); } return ("处理成功!"); } public void dealDiscountOrderCallBack(Goodsorder goodsorder){ goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay); goodsorder.setStatus(Constants.goodsorderStatus.pay); goodsorder.setPayDate(new Date()); goodsorder.setEditDate(new Date()); goodsorderMapper.updateById(goodsorder); DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda() .eq(DiscountMember::getGoodsorderId,goodsorder.getId()).last(" limit 1 ")); discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda() .set(DiscountMember::getStatus,Constants.ZERO) .eq(DiscountMember::getId,discountMember.getId()) ); Constants.TRANSACTIONS_TYPE discountConstants = Constants.TRANSACTIONS_TYPE.DISCOUNT; //存储交易流水表 Transactions transactions = new Transactions(); transactions.setMemberId(goodsorder.getMemberId()); transactions.setCreateDate(new Date()); transactions.setIsdeleted(Constants.ZERO); transactions.setOrderId(goodsorder.getId()); transactions.setMoney(goodsorder.getMoney()); transactions.setType(discountConstants.getKey()); transactions.setPreOrderid(goodsorder.getPreOrderid()); transactions.setOnlineOrderid(goodsorder.getOnlineOrderid()); transactions.setDoneDate(new Date()); transactions.setTitle(discountConstants.getName()); transactions.setContent(discountConstants.getInfo()); //transactions.setContent(discountMember.getName() +" 有效期" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd")); transactions.setBalance(goodsorder.getMoney()); transactions.setObjId(discountMember.getId()); transactions.setObjType(Constants.TWO); transactionsMapper.insert(transactions); } public void dealGoodsOrderCallBack(Goodsorder goodsorder){ goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay); goodsorder.setStatus(Constants.goodsorderStatus.pay); goodsorder.setPayDate(new Date()); @@ -1296,9 +1442,7 @@ transactions.setObjId(goodsorder.getId()); transactions.setObjType(Constants.ZERO); transactionsMapper.insert(transactions); return ("处理成功!"); } /** server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
@@ -1,20 +1,27 @@ package com.doumee.service.business.impl; import com.doumee.core.constants.Constants; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.dao.business.DiscountMemberMapper; import com.doumee.dao.business.RefundMapper; import com.doumee.dao.business.TransactionsMapper; import com.doumee.dao.business.model.DiscountMember; import com.doumee.dao.business.model.Transactions; import com.doumee.service.business.TransactionsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; /** * 交易流水表Service实现 @@ -26,6 +33,13 @@ @Autowired private TransactionsMapper transactionsMapper; @Autowired private DiscountMemberMapper discountMemberMapper; @Autowired private RefundMapper refundMapper; @Override public String create(Transactions transactions) { @@ -172,7 +186,23 @@ Utils.MP.blankToNull(pageWrap.getModel()); queryWrapper.lambda().eq(Transactions::getMemberId, memberId); queryWrapper.orderByDesc("create_date"); return PageData.from(transactionsMapper.selectPage(page, queryWrapper)); PageData<Transactions> pageData = PageData.from(transactionsMapper.selectPage(page, queryWrapper)); for (Transactions transactions:pageData.getRecords()) { if(Constants.equalsInteger(transactions.getType(),Constants.TRANSACTIONS_TYPE.DISCOUNT.getKey())){ //购买套餐 处理内容 DiscountMember discountMember = discountMemberMapper.selectById(transactions.getObjId()); if(Objects.nonNull(discountMember)){ transactions.setContent(discountMember.getName() +" 有效期" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd")); } }else if(Constants.equalsInteger(transactions.getType(),Constants.TRANSACTIONS_TYPE.PLATFORM_REFUND.getKey())){ DiscountMember discountMember = discountMemberMapper.selectOne( new QueryWrapper<DiscountMember>().lambda().eq(DiscountMember::getGoodsorderId, transactions.getOrderId()).last("limit 1")); if(Objects.nonNull(discountMember)){ transactions.setContent(discountMember.getName() +" 有效期" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd")); } } } return pageData; }
@@ -12,6 +12,7 @@ import com.doumee.dao.business.model.*; import com.doumee.dao.business.web.request.BackElecBikeRequest; import com.doumee.dao.business.web.request.RepairRequest; import com.doumee.dao.business.web.response.HomeResponse; import com.doumee.dao.business.web.response.MemberRidesDetailResponse; import com.doumee.dao.business.web.response.RidesDetailResponse; import com.doumee.dao.system.model.SystemDictData; @@ -67,6 +68,9 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired private DiscountService discountService; @PreventRepeat @LoginRequired @ApiOperation(value = "押金支付", notes = "小程序端") @@ -77,6 +81,20 @@ public ApiResponse<Object> createGoodsOrderPay() { return ApiResponse.success("操作成功",goodsorderService.createGoodsOrderPay(getMemberId())); } @PreventRepeat @LoginRequired @ApiOperation(value = "套餐购买", notes = "小程序端") @GetMapping("/createDiscountOrderPay") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "discountId", value = "套餐主键", required = true) }) public ApiResponse<Object> createDiscountOrderPay(@RequestParam String discountId) { return ApiResponse.success("操作成功",goodsorderService.createDiscountOrderPay(discountId,getMemberId())); } @LoginRequired @ApiOperation(value = "骑行明细", notes = "小程序端") @@ -112,6 +130,24 @@ return ApiResponse.success(transactionsService.findPageForMini(pageWrap,getMemberId())); } @LoginRequired @ApiOperation(value = "热销套餐", notes = "热销套餐") @GetMapping("/discountPage") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true) }) public ApiResponse<PageData<Discount>> discountPage (@RequestBody PageWrap<Discount> pageWrap) { Discount discount = new Discount(); discount.setStatus(Constants.ZERO); pageWrap.setModel(discount); return ApiResponse.success(discountService.findPage(pageWrap)); } @LoginRequired @ApiOperation("基础配置数据") @GetMapping("/baseParamList") server/web/src/main/java/com/doumee/api/web/HomeApi.java
@@ -50,9 +50,6 @@ return ApiResponse.success("查询成功",homeResponse); } @ApiOperation(value = "测试电池控制", notes = "测试电池控制") @PostMapping("/testControl") public ApiResponse<APIResult<T0201_0500>> testControl(@RequestBody T8500 param) {
