ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserAddressClient.java
@@ -5,7 +5,7 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; /** @@ -21,6 +21,6 @@ * @param id * @return */ @PostMapping("/t-app-user-address/getAppUserAddressById") R<TAppUserAddress> getAppUserAddressById(Long id); @PostMapping("/t-app-user-address/getAppUserAddressById/{id}") R<TAppUserAddress> getAppUserAddressById(@PathVariable("id") Long id); } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -6,10 +6,7 @@ import com.ruoyi.common.core.domain.R; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -37,11 +34,11 @@ * @param id * @return */ @PostMapping(value = "/t-app-user/user/getUserById") R<TAppUser> getUserById(Long id); @PostMapping(value = "/t-app-user/user/getUserById/{id}") R<TAppUser> getUserById(@PathVariable("id") Long id); @PostMapping("/t-app-user/") R updateAppUser(TAppUser appUser); @PostMapping("/t-app-user//user/updateAppUser") R updateAppUser(@RequestBody TAppUser appUser); } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserIntegralChangeClient.java
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * @author zhibing.pu @@ -20,5 +21,5 @@ * @return */ @PostMapping("/t-app-user-integral-change/addAppUserIntegralChange") R addAppUserIntegralChange(TAppUserIntegralChange appUserIntegralChange); R addAppUserIntegralChange(@RequestBody TAppUserIntegralChange appUserIntegralChange); } ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; /** @@ -20,8 +21,8 @@ * @param id * @return */ @PostMapping("/t-charging-gun/getAllName") R<String> getAllName(Integer id); @PostMapping("/t-charging-gun/getAllName/{id}") R<String> getAllName(@PathVariable("id") Integer id); /** @@ -29,6 +30,6 @@ * @param id * @return */ @PostMapping("/t-charging-gun/getChargingGunById") R<TChargingGun> getChargingGunById(Integer id); @PostMapping("/t-charging-gun/getChargingGunById/{id}") R<TChargingGun> getChargingGunById(@PathVariable("id") Integer id); } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java
@@ -6,6 +6,7 @@ import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -26,8 +27,8 @@ * @param days 天数 * @return */ @PostMapping("/t-charging-order-accounting-strategy/getTotalElectricQuantity") R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days, @RequestParam("siteIds") Set<Integer> siteIds); @PostMapping("/t-charging-order-accounting-strategy/getTotalElectricQuantity/{days}") R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable("days") Integer days, @RequestParam("siteIds") Set<Integer> siteIds); /** @@ -35,6 +36,6 @@ * @param days * @return */ @PostMapping("/t-charging-order-getDailyChargingDegree-strategy/getUtilizationTrend") R<List<Double>> getDailyChargingDegree(Integer days, @RequestParam("siteIds") Set<Integer> siteIds); @PostMapping("/t-charging-order-getDailyChargingDegree-strategy/getUtilizationTrend/{days}") R<List<Double>> getDailyChargingDegree(@PathVariable("days") Integer days, @RequestParam("siteIds") Set<Integer> siteIds); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java
@@ -6,6 +6,7 @@ import com.ruoyi.other.api.factory.CouponFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; /** @@ -21,6 +22,6 @@ * @param id * @return */ @PostMapping("/t-coupon/getCouponById") R<TCoupon> getCouponById(Integer id); @PostMapping("/t-coupon/getCouponById/{id}") R<TCoupon> getCouponById(@PathVariable("id") Integer id); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GoodsClient.java
@@ -6,6 +6,7 @@ import com.ruoyi.other.api.factory.GoodsFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; /** @@ -20,6 +21,6 @@ * @param id * @return */ @PostMapping("/t-goods/getGoodsById") R<TGoods> getGoodsById(Integer id); @PostMapping("/t-goods/getGoodsById/{id}") R<TGoods> getGoodsById(@PathVariable("id") Integer id); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RoleSiteClient.java
@@ -33,13 +33,13 @@ * @return */ @PostMapping("/t-role-site/addRoleSite") R addRoleSite(List<TRoleSite> roleSites); R addRoleSite(@RequestBody List<TRoleSite> roleSites); /** * 删除角色站点数据 * @param roleId * @return */ @DeleteMapping("/t-role-site/delRoleSite") R delRoleSite(Long roleId); @DeleteMapping("/t-role-site/delRoleSite/{roleId}") R delRoleSite(@PathVariable("roleId") Long roleId); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TEvaluationTagClient.java
@@ -8,6 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -34,5 +35,5 @@ * @return */ @PostMapping("/t-evaluation-tag/getListByIds") R<List<TEvaluationTag>> getListByIds(List<Integer> tagIds); R<List<TEvaluationTag>> getListByIds(@RequestBody List<Integer> tagIds); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/UserSiteClient.java
@@ -6,10 +6,7 @@ import com.ruoyi.other.api.factory.UserSiteFallbackFactory; import org.apache.ibatis.annotations.Delete; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -26,8 +23,8 @@ * @param userId * @return */ @PostMapping("/t-user-site/getSiteIds") R<List<Integer>> getSiteIds(Long userId); @PostMapping("/t-user-site/getSiteIds/{userId}") R<List<Integer>> getSiteIds(@PathVariable("userId") Long userId); /** @@ -35,8 +32,8 @@ * @param userSite * @return */ @PostMapping("/t-user-site/getSiteIds") R addUserSite(List<TUserSite> userSite); @PostMapping("/t-user-site/addUserSite") R addUserSite(@RequestBody List<TUserSite> userSite); /** @@ -44,6 +41,6 @@ * @param userId * @return */ @DeleteMapping("/t-user-site/delUserSite") R delUserSite(Long userId); @DeleteMapping("/t-user-site/delUserSite/{userId}") R delUserSite(@PathVariable("userId") Long userId); } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -100,7 +100,7 @@ * @param user */ @PostMapping("/user/addSysUser") R addSysUser(SysUser user); R addSysUser(@RequestBody SysUser user); /** @@ -109,5 +109,5 @@ * @return */ @PostMapping("/user/resetPassword") R resetPassword(SysUser user); R resetPassword(@RequestBody SysUser user); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -45,8 +45,6 @@ public class TAppCouponController { @Autowired private TAppCouponService tAppCouponService; @Autowired private OtherClient otherClient; @Autowired private TAppUserCarService appUserCarService; ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -62,7 +62,7 @@ @GetMapping(value = "/addOrderAppeal") @ApiOperation(value = "申诉订单", tags = {"小程序-充电记录（个人中心）"}) public AjaxResult addOrderAppeal(@RequestBody TOrderAppeal orderAppeal){ Long appUserId = tokenService.getLoginUser().getUserid(); Long appUserId = tokenService.getLoginUserApplet().getUserId(); orderAppeal.setAppUserId(appUserId); orderAppeal.setStatus(1); orderAppealService.save(orderAppeal); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -65,7 +65,7 @@ */ @Override public Map<String, Object> getMyChargingOrderList(GetMyChargingOrderList query) { Long appUserId = tokenService.getLoginUser().getUserid(); Long appUserId = tokenService.getLoginUserApplet().getUserId(); Map<String, Object> map = new HashMap<>(); int size = this.baseMapper.getMyChargingOrderList(appUserId, 1, null, null).size(); map.put("number", size); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
@@ -58,7 +58,7 @@ */ @Override public List<MyExchangeOrderList> getMyExchangeOrder(GetMyExchangeOrder query) { Long userid = tokenService.getLoginUser().getUserid(); Long userid = tokenService.getLoginUserApplet().getUserId(); LambdaQueryWrapper<TExchangeOrder> wrapper = new LambdaQueryWrapper<TExchangeOrder>().eq(TExchangeOrder::getDelFlag, 0).eq(TExchangeOrder::getAppUserId, userid); if(query.getStatus() == 0){ wrapper.ne(TExchangeOrder::getStatus, 4); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -246,7 +246,7 @@ } orderEvaluate = new TOrderEvaluate(); BeanUtils.copyProperties(query, orderEvaluate); Long userid = tokenService.getLoginUser().getUserid(); Long userid = tokenService.getLoginUserApplet().getUserId(); orderEvaluate.setAppUserId(userid); if(query.getOrderType() == 1){ TChargingOrder chargingOrder = chargingOrderService.getById(query.getOrderId()); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java
@@ -38,8 +38,8 @@ } @PostMapping("/getTagList") public R<List<TEvaluationTagVO>> getTagList() { return R.ok(evaluationTagService.getTagList()); public R<List<TEvaluationTagVO>> getTagList(@RequestParam("type") Integer type) { return R.ok(evaluationTagService.getTagList(type)); }
@@ -22,7 +22,7 @@ * 获取评价标签列表 * @return */ List<TEvaluationTagVO> getTagList(); List<TEvaluationTagVO> getTagList(Integer type); /** ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEvaluationTagService.java
@@ -22,7 +22,7 @@ * 查询标签列表 * @return */ List<TEvaluationTagVO> getTagList(); List<TEvaluationTagVO> getTagList(Integer type); /** ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEvaluationTagServiceImpl.java
@@ -23,8 +23,8 @@ public class TEvaluationTagServiceImpl extends ServiceImpl<TEvaluationTagMapper, TEvaluationTag> implements TEvaluationTagService { @Override public List<TEvaluationTagVO> getTagList() { return this.baseMapper.getTagList(); public List<TEvaluationTagVO> getTagList(Integer type) { return this.baseMapper.getTagList(type); }
@@ -17,7 +17,11 @@ </sql> <select id="getTagList" resultType="com.ruoyi.other.api.vo.TEvaluationTagVO"> select <include refid="Base_Column_List"></include> from t_evaluation_tag where del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} ORDER BY `type` from t_evaluation_tag where del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} <if test="null != type"> and `type` = #{type} </if> ORDER BY `type` </select>
