ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
@@ -73,7 +73,9 @@ @ApiModelProperty(value = "状态（1=未使用，2=已使用）") @TableField("status") private Integer status; @ApiModelProperty(value = "订单id 后台发放的优惠券没有订单id") @TableField("orderId") private Long orderId;
@@ -8,10 +8,10 @@ @Data @ApiModel("管理后台 优惠券兑换记录") public class ExchangeRecordGoodsQuery extends BasePage { @ApiModelProperty(value = "用户名称") private String name; @ApiModelProperty(value = "用户手机号") private String phone; @ApiModelProperty(value = "状态1未使用 2已使用 3已过期 4已取消") private Integer state; private Integer status; @ApiModelProperty(value = "优惠券id",required = true) private Integer couponId; } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -5,21 +5,32 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; @Data @ApiModel("管理后台 优惠券兑换记录列表返回VO") public class ExchangeRecordVO { @ApiModelProperty(value = "获得时间") private String name; private String createTime; @ApiModelProperty(value = "获得用户") private String state; private String phone; @ApiModelProperty(value = "优惠金额") private String discountAmount; @ApiModelProperty(value = "使用门槛") private String meetTheConditions; @ApiModelProperty(value = "使用状态 1未使用 2已使用") @ApiModelProperty(value = "使用状态 1未使用 2已使用 3已过期 4已取消") private Integer status; @ApiModelProperty(value = "失效时间") private String endTime; private String endTime1; @ApiModelProperty(value = "失效时间 前端忽略") private LocalDateTime endTime; @ApiModelProperty(value = "关联订单") private String orderId; @ApiModelProperty(value = " 前端忽略 获取方式 1=积分兑换 2现金购买") private Integer waysToObtain; @ApiModelProperty(value = " 是否删除0否1是") private Integer delFlag; @ApiModelProperty(value = "三方支付流水号 前端忽略") private String serialNumber; } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java
@@ -5,6 +5,7 @@ import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery; import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.common.core.web.page.PageInfo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,5 +19,5 @@ */ public interface TAppCouponMapper extends BaseMapper<TAppCoupon> { List<ExchangeRecordVO> pageList(PageInfo<ExchangeRecordVO> pageInfo, ExchangeRecordGoodsQuery dto); List<ExchangeRecordVO> pageList(@Param("pageInfo")PageInfo<ExchangeRecordVO> pageInfo,@Param("req") ExchangeRecordGoodsQuery dto); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -6,11 +6,14 @@ import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.account.mapper.TAppCouponMapper; import com.ruoyi.account.service.TAppCouponService; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.other.api.domain.TCoupon; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; /** @@ -26,8 +29,69 @@ @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); // 现金优惠券 StringBuilder stringBuilder = new StringBuilder(); // 积分优惠券 StringBuilder stringBuilder1 = new StringBuilder(); for (ExchangeRecordVO exchangeRecordVO : list) { switch (exchangeRecordVO.getWaysToObtain()){ case 1: if (exchangeRecordVO.getSerialNumber()!=null){ stringBuilder.append(exchangeRecordVO.getSerialNumber()).append(","); }else{ stringBuilder.append("0").append(","); } break; case 2: if (exchangeRecordVO.getSerialNumber()!=null){ stringBuilder1.append(exchangeRecordVO.getSerialNumber()).append(","); }else{ stringBuilder1.append("0").append(","); } break; } Date date = DateUtils.toDate(exchangeRecordVO.getEndTime()); exchangeRecordVO.setEndTime1(format.format(date)); if (exchangeRecordVO.getStatus()==1){ if (exchangeRecordVO.getDelFlag() == 1){ // 删除了 就是已取消状态 exchangeRecordVO.setStatus(4); }else{ // 未删除 判断endTime是否过期 // 设置了过期时间 if (exchangeRecordVO.getEndTime().isBefore(java.time.LocalDateTime.now())){ exchangeRecordVO.setStatus(3); }else{ // 没过期 exchangeRecordVO.setStatus(1); } } } if (exchangeRecordVO.getStatus()==2){ if (exchangeRecordVO.getDelFlag() == 1){ // 删除了 就是已取消状态 exchangeRecordVO.setStatus(4); }else{ exchangeRecordVO.setStatus(2); } } // 根据购买方式 查询对应订单号 } // 去除最后一个字符 if (StringUtils.hasText(stringBuilder.toString())){ String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString(); // 远程调用 查询关联的现金优惠券订单编号 } if (StringUtils.hasText(stringBuilder.toString())){ String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString(); // 远程调用 查询关联的积分兑换优惠券订单编号 } pageInfo.setRecords(list); return pageInfo; } ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml
@@ -23,5 +23,39 @@ <sql id="Base_Column_List"> id, app_user_id, coupon_id, end_time, ways_to_obtain, redeem_points, payment_amount, payment_type, serial_number, payment_time, status, create_time, del_flag </sql> <select id="pageList" resultType="com.ruoyi.account.api.vo.ExchangeRecordVO"> select t1.id,t1.app_user_id as appUserId, t1.coupon_id as couponId, t1.end_time as endTime, t1.ways_to_obtain as waysToObtain, t1.redeem_points as redeemPoints, t1.payment_amount as paymentAmount, t1.payment_type as paymentType, t1.serial_number as serialNumber, t1.payment_time as paymentTime, t1.status, t1.create_time AS createTime, t1.del_flag AS delFlag, t2.phone from t_app_coupon t1 left join t_app_user t2 on t1.app_user_id = t2.id <where> and t1.coupon_id = #{req.couponId} <if test="req.phone != null and req.phone != ''"> AND t2.phone LIKE concat('%',#{req.phone}, '%') </if> <if test="req.status != null and req.status = 1"> AND t1.status =1 and t1.endTime >= now() </if> <if test="req.status != null and req.status = 2"> AND t1.status =2 </if> <if test="req.status != null and req.status = 3"> AND t1.status =1 and t1.endTime <= now() and t1.del_flag = 0 </if> <if test="req.status != null and req.status = 4"> AND t1.del_flag = 0 </if> </where> ORDER BY create_time DESC </select> </mapper> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** @@ -67,5 +68,50 @@ } return R.ok(res); } /** * 管理后台 根据t_app_coupon流水号查询现金优惠券的订单编号 * @param goodsIds 订单号-商品类型 * @return */ @PostMapping("/getCodeBySerialNumber") public R<List<String>> getCodeBySerialNumber(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()); }else{ strings.add(""); } } return R.ok(strings); } /** * 管理后台 根据t_app_coupon流水号查询积分兑换优惠券的订单编号 * @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); } }
