ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/TagListQueryDto.java
New file @@ -0,0 +1,9 @@ package com.ruoyi.other.api.dto; import com.ruoyi.common.core.web.page.BasePage; import lombok.Data; @Data public class TagListQueryDto extends BasePage { private String tagName; } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/UnitListQueryDto.java
New file @@ -0,0 +1,9 @@ package com.ruoyi.other.api.dto; import com.ruoyi.common.core.web.page.BasePage; import lombok.Data; @Data public class UnitListQueryDto extends BasePage { private String companyName; } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/IntegralRuleFallbackFactory.java
@@ -1,22 +1,13 @@ package com.ruoyi.other.api.factory; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.dto.TagListQueryDto; import com.ruoyi.account.api.dto.UnitListQueryDto; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.api.domain.TIntegralRule; import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.other.api.feignClient.IntegralRuleClient; import com.ruoyi.other.api.feignClient.OtherClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; /** * 商品服务降级处理 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
@@ -1,14 +1,14 @@ package com.ruoyi.other.api.factory; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.dto.TagListQueryDto; import com.ruoyi.account.api.dto.UnitListQueryDto; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.api.domain.TCoupon; import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.other.api.dto.TagListQueryDto; import com.ruoyi.other.api.dto.UnitListQueryDto; import com.ruoyi.other.api.feignClient.OtherClient; import com.ruoyi.other.api.vo.CouponListVOVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -1,15 +1,15 @@ package com.ruoyi.other.api.feignClient; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.dto.TagListQueryDto; import com.ruoyi.account.api.dto.UnitListQueryDto; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.api.domain.TCoupon; import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.other.api.dto.TagListQueryDto; import com.ruoyi.other.api.dto.UnitListQueryDto; import com.ruoyi.other.api.factory.OtherFallbackFactory; import com.ruoyi.other.api.vo.CouponListVOVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/CouponListVOVO.java
New file @@ -0,0 +1,40 @@ package com.ruoyi.other.api.vo; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; @Data @ApiModel("管理后台 优惠券兑换记录列表返回VO") public class CouponListVOVO extends BasePojo { @ApiModelProperty(value = "优惠券名称") private String couponName; @ApiModelProperty(value = "优惠方式 1满减 2折扣") private Integer preferentialMode; @ApiModelProperty(value = "满减--优惠金额") private BigDecimal discountAmount; @ApiModelProperty(value = "满减--使用门槛 满减条件") private BigDecimal meetTheConditions; @ApiModelProperty(value = "折扣--折扣") private BigDecimal discount; @ApiModelProperty(value = "折扣--最高折扣金额") private BigDecimal maximumDiscountAmount; @ApiModelProperty(value = "优惠券数量") private Integer couponCount; @ApiModelProperty(value = "有效期") private String validityTime; @ApiModelProperty(value = "结束时间 前端忽略") private LocalDateTime endTime; @ApiModelProperty(value = "是否可用") private Integer isUse; @ApiModelProperty(value = "优惠券id") private Long couponId; @ApiModelProperty(value = "使用了优惠券后的服务费 用于判断哪一张优惠券优惠力度最大 前端忽略") private BigDecimal money; @ApiModelProperty(value = "当前用户是否为会员0否1是 前端忽略") private Integer isVip; } ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/CodeGenerateUtils.java
New file @@ -0,0 +1,106 @@ package com.ruoyi.common.core.utils; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Calendar; /** * @Description 活动订单操作 * @Author xiaochen * @Date 2021/7/28 10:26 */ public class CodeGenerateUtils { /** * @return * @Description 获取商品编码 * 商品编码规则：nanoTime(后5位)*5位随机数(10000~99999) * @Author xiaochen */ public static String generateProductCode() { long nanoPart = System.nanoTime() % 100000L; if (nanoPart < 10000L) { nanoPart += 10000L; } long randomPart = (long) (Math.random() * (90000) + 10000); String code = "0" + String.valueOf((new BigDecimal(nanoPart).multiply(new BigDecimal(randomPart)))); return code.substring(code.length() - 10); } /** * @param id: 用户id * @return * @Description 生成订单编号 * 订单编号规则：(10位)：(年末尾*月，取后2位)+（用户ID%3.33*日取整后2位）+(timestamp*10000以内随机数，取后6位) * @Author xiaochen */ public static String generateOrderSn(long id) { Calendar calendar = Calendar.getInstance(); int year = calendar.get(Calendar.YEAR); year = year % 10; if (year == 0) year = 10; int month = calendar.get(Calendar.MONTH) + 1; int yearMonth = year * month; String yearMonthPart = "0" + yearMonth; yearMonthPart = yearMonthPart.substring(yearMonthPart.length() - 2); int day = calendar.get(Calendar.DAY_OF_MONTH); int dayNum = (int) ((id % 3.33) * day); String dayPart = "0" + dayNum; dayPart = dayPart.substring(dayPart.length() - 2); String timestampPart = "" + (Math.random() * 10000) * (System.currentTimeMillis() / 10000); timestampPart = timestampPart.replace(".", "").replace("E", ""); timestampPart = timestampPart.substring(0, 6); return yearMonthPart + dayPart + timestampPart; } /** * @return * @Description 生成统一支付单号 规则：年(2)月(2)日(2)时(2)分(2)+timestamp*5位随机整数取后5位 * @Author xiaochen */ public static String generateVolumeSn() { Calendar calendar = Calendar.getInstance(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); String dateTime = dateFormat.format(calendar.getTime()); dateTime = dateTime.substring(2); String timestampPart = "" + (Math.random() * 10000) * (System.currentTimeMillis() / 10000); timestampPart = timestampPart.replace(".", "").replace("E", ""); timestampPart = timestampPart.substring(0, 5); return dateTime + timestampPart; } public static void main(String[] args) { for (long i = 0; i < 20; i++) { //String timestampPart = ""+(Math.random() * 10000) * (System.currentTimeMillis()/10000); //System.out.println(timestampPart); //System.out.println(generateOrderSn(i)); long l = System.currentTimeMillis() * Long.valueOf(CodeGenerateUtils.generateProductCode().substring(0, 5)); System.out.println(String.valueOf(l).substring(0,10)); } } /** * @description id补0生成编号 * @author jqs * @date 2024/4/17 14:19 * @param totalLength * @param id * @return String */ public static String toFillZeroCode(int totalLength, Long id) { String idStr = id.toString(); int length = idStr.length(); if(totalLength <= length){ return idStr; } int fillLength = totalLength - length; StringBuilder idsbs = new StringBuilder(); for (int i = 0; i < fillLength; i++) { idsbs.append("0"); } return idsbs.append(idStr).toString(); } } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -7,14 +7,12 @@ import com.ruoyi.account.api.model.TAppCoupon; import com.ruoyi.account.api.model.TAppUserCar; import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery; import com.ruoyi.account.api.vo.CarListVO; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.other.api.vo.CouponListVOVO; import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.account.service.TAppCouponService; import com.ruoyi.account.service.TAppUserCarService; import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient; import com.ruoyi.chargingPile.api.vo.SiteInfoVO; import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.BasePage; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -1,25 +1,17 @@ package com.ruoyi.account.controller; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.dto.*; import com.ruoyi.account.api.model.*; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.account.service.*; import com.ruoyi.account.util.PointDetailUtil; import com.ruoyi.account.util.SignDayUtil; import com.ruoyi.account.wx.body.resp.Code2SessionRespBody; import com.ruoyi.account.wx.body.resq.Code2SessionResqBody; import com.ruoyi.account.wx.model.WeixinProperties; import com.ruoyi.account.wx.tools.WxAppletTools; import com.ruoyi.account.util.GiveVipUtil; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; @@ -29,9 +21,7 @@ import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.BasePojo; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.auth.AuthUtil; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; @@ -39,21 +29,16 @@ import com.ruoyi.order.api.feignClient.ExchangeOrderClient; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TExchangeOrder; import com.ruoyi.other.api.dto.UnitListQueryDto; import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.api.domain.TCoupon; import com.ruoyi.other.api.domain.TIntegralRule; import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.other.api.feignClient.IntegralRuleClient; import com.ruoyi.other.api.feignClient.OtherClient; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.LoginUserApplet; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.formula.functions.T; import lombok.extern.slf4j.Slf4j; import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -2,13 +2,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.api.dto.TagListQueryDto; import com.ruoyi.account.api.dto.UnitListQueryDto; import com.ruoyi.account.api.model.TAppUser; import com.ruoyi.other.api.dto.TagListQueryDto; import com.ruoyi.account.api.model.TAppUserTag; import com.ruoyi.account.service.TAppUserTagService; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.other.api.feignClient.OtherClient; import io.swagger.annotations.ApiOperation; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java
@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.account.api.model.TAppCoupon; import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.other.api.vo.CouponListVOVO; import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.common.core.web.page.PageInfo; import org.apache.ibatis.annotations.Param; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java
@@ -4,7 +4,7 @@ import com.ruoyi.account.api.dto.CouponListDto; import com.ruoyi.account.api.model.TAppCoupon; import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.other.api.vo.CouponListVOVO; import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.common.core.web.page.BasePage; import com.ruoyi.common.core.web.page.PageInfo; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -7,7 +7,7 @@ import com.ruoyi.account.api.model.TAppUser; import com.ruoyi.account.api.model.TAppUserVipDetail; import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery; import com.ruoyi.account.api.vo.CouponListVOVO; import com.ruoyi.other.api.vo.CouponListVOVO; import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.account.mapper.TAppCouponMapper; import com.ruoyi.account.mapper.TAppUserMapper; @@ -63,6 +63,10 @@ private ChargingOrderClient chargingOrderClient; @Autowired private TAppUserVipDetailService tAppUserVipDetailService; @Autowired private TAppUserMapper tAppUserMapper; @Autowired private TokenService tokenService; @Override public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) { @@ -132,10 +136,7 @@ } @Autowired private TAppUserMapper tAppUserMapper; @Autowired private TokenService tokenService; @Override public PageInfo<CouponListVOVO> couponList(CouponListDto dto) { // todo token获取用户id ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml
@@ -57,7 +57,7 @@ </where> ORDER BY create_time DESC </select> <select id="couponList" resultType="com.ruoyi.account.api.vo.CouponListVOVO"> <select id="couponList" resultType="com.ruoyi.other.api.vo.CouponListVOVO"> SELECT t1.app_user_id AS appUserId, t1.coupon_id AS couponId, ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -162,6 +162,18 @@ return siteService.addSite(site); } @ResponseBody @PostMapping("/getSiteInfo") @ApiOperation(value = "获取站点详情", tags = {"管理后台-站点管理"}) public AjaxResult<Site> getSiteInfo(@PathVariable Integer id){ Site site = siteService.getById(id); return AjaxResult.success(site); } @ResponseBody @PostMapping("/editSite") @ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"}) ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileNotificationController.java
@@ -43,8 +43,7 @@ @ApiOperation(value = "删除系统通知", tags = {"管理后台-系统通知"}) public AjaxResult delChargingPileNotification(@RequestParam("id") Long id){ TChargingPileNotification chargingPileNotification = chargingPileNotificationService.getById(id); chargingPileNotification.setDelFlag(1); chargingPileNotificationService.updateById(chargingPileNotification); chargingPileNotificationService.removeById(chargingPileNotification); return AjaxResult.success(); }
@@ -3,6 +3,7 @@ import com.ruoyi.chargingPile.api.model.TVehicleRamp; import com.ruoyi.chargingPile.service.TVehicleRampService; import com.ruoyi.common.core.utils.CodeGenerateUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.BaseDelete; import com.ruoyi.common.log.annotation.Log; @@ -43,6 +44,7 @@ @ApiOperation(tags = {"后台-车道"},value = "添加车道") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@RequestBody TVehicleRamp dto) { dto.setCarportNum(CodeGenerateUtils.generateVolumeSn()); return AjaxResult.ok(vehicleRampService.save(dto)); }
