ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
@@ -1,14 +1,21 @@ package com.ruoyi.account.api.dto; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class UserListQueryDto extends BasePage { @ApiModelProperty(value = "用户手机号") String userPhone; @ApiModelProperty(value = "所在地code") String cityCode; @ApiModelProperty(value = "状态 1正常2冻结 3注销") Integer status; @ApiModelProperty(value = "用户标签id") Integer userTagId; @ApiModelProperty(value = "会员类型id") Integer vipTypeId; @ApiModelProperty(value = "单位id") Integer companyId; } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
@@ -2,10 +2,14 @@ import com.ruoyi.account.api.factory.AppCouponFallbackFactory; import com.ruoyi.account.api.factory.AppUserFallbackFactory; import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery; import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.page.PageInfo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -29,4 +33,11 @@ */ @PostMapping("/t-app-coupon/getUseCountByCouponId") public R<Integer> getUseCountByCouponId(Integer couponId); /** * 后台远程调用 根据优惠券id 查询领取记录 * @param couponId * @return */ @PostMapping("/t-app-coupon/getExchangeRecordByCouponId") R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId); } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -11,7 +11,9 @@ @ApiModel("管理后台 优惠券兑换记录列表返回VO") public class ExchangeRecordVO { @ApiModelProperty(value = "获得时间") private String createTime; private String createTime1; @ApiModelProperty(value = "获得时间 前端忽略") private LocalDateTime createTime; @ApiModelProperty(value = "获得用户") private String phone; @ApiModelProperty(value = "优惠金额") @@ -28,6 +30,8 @@ private String orderId; @ApiModelProperty(value = " 前端忽略 获取方式 1=积分兑换 2现金购买") private Integer waysToObtain; @ApiModelProperty(value = " 是否删除0否1是") @ApiModelProperty(value = "优惠券id") private Integer couponId; @ApiModelProperty(value = " 是否删除0否1是 前端忽略") private Integer delFlag; } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -28,8 +28,15 @@ @Override public R<List<Integer>> getSalesCountByGoodsId(String goodsIds) { return null; return R.fail("根据商品订单ids查询销量:" + cause.getMessage()); } @Override public R<List<String>> getCodeByOrderId(String goodsIds) { return R.fail("根据订单ids查询现金购买优惠券订单编号:" + cause.getMessage()); } }; } } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -18,4 +18,13 @@ @PostMapping("/t-exchange-order/getSalesCountByGoodsIds") R<List<Integer>> getSalesCountByGoodsId(String goodsIds); /** * 管理后台 根据t_app_coupon订单购买或者兑换优惠券的订单编号 * @param goodsIds 订单号-商品类型 * @return */ @PostMapping("/getCodeByOrderId") public R<List<String>> getCodeByOrderId(String goodsIds); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -71,7 +71,7 @@ * @return */ @PostMapping("/getExchangeRecordByCouponId") public R<PageInfo<ExchangeRecordVO>> getUseCountByCouponId(ExchangeRecordGoodsQuery couponId){ public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId){ return R.ok(tAppCouponService.pagelist(couponId)); } } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -96,14 +96,10 @@ @PostMapping(value = "/user/page") public R<Page<TAppUser>> userPage(@RequestBody UserListQueryDto userListQueryDto) { List<Long> userIds = new ArrayList<>(); //如果要筛选标签。用标签获取useids if (userListQueryDto.getUserTagId() != null){ userIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getUserTagId, userListQueryDto.getUserTagId()).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList()); } //列表查询 Page<TAppUser> page = appUserService.lambdaQuery() .like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone()) @@ -138,6 +134,7 @@ @ApiOperation(value = "用户添加编辑", tags = {"用户管理-用户列表"}) @PostMapping(value = "/user/addOrUpdate") public R addOrUpdate(@RequestBody TAppUser tAppUser) { ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -8,7 +8,10 @@ import com.ruoyi.account.service.TAppCouponService; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.order.api.feignClient.OrderClient; import com.ruoyi.other.api.domain.TCoupon; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -27,16 +30,15 @@ @Service public class TAppCouponServiceImpl extends ServiceImpl<TAppCouponMapper, TAppCoupon> implements TAppCouponService { @Autowired private OrderClient orderClient; @Override public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); PageInfo<ExchangeRecordVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize()); List<ExchangeRecordVO> list = this.baseMapper.pageList(pageInfo,dto); // 现金优惠券订单 // 订单ids StringBuilder stringBuilder = new StringBuilder(); // 积分优惠券订单 StringBuilder stringBuilder1 = new StringBuilder(); for (ExchangeRecordVO exchangeRecordVO : list) { switch (exchangeRecordVO.getWaysToObtain()){ case 1: @@ -48,15 +50,16 @@ break; case 2: if (exchangeRecordVO.getOrderId()!=null){ stringBuilder1.append(exchangeRecordVO.getOrderId()).append(","); stringBuilder.append("-").append(exchangeRecordVO.getOrderId()).append(","); }else{ stringBuilder1.append("0").append(","); stringBuilder.append("-").append("0").append(","); } break; } Date date = DateUtils.toDate(exchangeRecordVO.getEndTime()); Date date1 = DateUtils.toDate(exchangeRecordVO.getCreateTime()); exchangeRecordVO.setEndTime1(format.format(date)); exchangeRecordVO.setCreateTime1(format.format(date1)); if (exchangeRecordVO.getStatus()==1){ if (exchangeRecordVO.getDelFlag() == 1){ // 删除了 就是已取消状态 @@ -85,12 +88,13 @@ // 去除最后一个字符 if (StringUtils.hasText(stringBuilder.toString())){ String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString(); // 远程调用 查询关联的现金优惠券订单编号 // 远程调用 查询关联的订单编号 List<String> data = orderClient.getCodeByOrderId(string).getData(); for (int i = 0; i < list.size(); i++) { list.get(i).setOrderId(data.get(i)); } } if (StringUtils.hasText(stringBuilder.toString())){ String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString(); // 远程调用 查询关联的积分兑换优惠券订单编号 } pageInfo.setRecords(list); return pageInfo; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -69,49 +69,45 @@ return R.ok(res); } /** * 管理后台 根据t_app_coupon流水号查询现金优惠券的订单编号 * 管理后台 根据t_app_coupon订单ids查询优惠券的订单编号 * @param goodsIds 订单号-商品类型 * @return */ @PostMapping("/getCodeBySerialNumber") public R<List<String>> getCodeBySerialNumber(String goodsIds){ @PostMapping("/getCodeByOrderId") public R<List<String>> getCodeByOrderId(String goodsIds){ String[] split = goodsIds.split("-"); List<String> strings = new ArrayList<>(); for (String s : split) { TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>() .eq("order_type", 2) .eq("serial_number", s)); if (one != null){ strings.add(one.getCode()); if (s.contains("-")){ // 带有负号的是积分兑换的订单 TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder>() .eq("order_type", 2) .eq("id", s.replace("-",""))); if (one != null){ strings.add(one.getCode()); }else{ strings.add(""); } }else{ strings.add(""); TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>() .eq("order_type", 2) .eq("id", s)); if (one != null){ strings.add(one.getCode()); }else{ strings.add(""); } } } return R.ok(strings); } /** * 管理后台 根据t_app_coupon流水号查询积分兑换优惠券的订单编号 * 管理后台 根据t_app_coupon订单ids查询积分兑换优惠券的订单编号 * @param goodsIds 订单号-商品类型 * @return */ @PostMapping("/getCodeBySerialNumberIntegral") public R<List<String>> getCodeBySerialNumberIntegral(String goodsIds){ String[] split = goodsIds.split("-"); List<String> strings = new ArrayList<>(); for (String s : split) { TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder >() .eq("order_type", 2) .eq("serial_number", s)); if (one != null){ strings.add(one.getCode()); }else{ strings.add(""); } } return R.ok(strings); } }
@@ -17,6 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.List; import java.util.Objects; /** * <p> * 前端控制器 @@ -64,8 +68,20 @@ @PostMapping("/exchangeRecord") @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录") public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) { return AjaxResult.ok(null); PageInfo<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData(); List<ExchangeRecordVO> records = data.getRecords(); for (ExchangeRecordVO record : records) { TCoupon byId = tCouponService.getById(record.getCouponId()); if (byId!=null){ record.setDiscountAmount("￥"+byId.getDiscountAmount()); if (Objects.equals(byId.getMeetTheConditions(), BigDecimal.ZERO)){ record.setMeetTheConditions("无门槛"); }else{ record.setMeetTheConditions("满"+byId.getMeetTheConditions()+"元可用"); } } } return AjaxResult.ok(data); } @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券列表分页查询") @PostMapping(value = "/pageList")
