ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
@@ -44,11 +44,6 @@ } @Override public R<Void> calculationCommission(Set<String> orderIds) { return R.fail("计算佣金失败"); } @Override public R<Price> getGoodsPrice(Long appUserId, Integer goodsId, Integer shopId) { return R.fail("获取商品价格失败"); } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
@@ -56,7 +56,7 @@ /** * 获取返佣积分上级类型（1=直推上级，2=直帮上级） */ private Integer superiorType; private String superiorType; /** * 核销门店可获得服务费 */ ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java
@@ -41,7 +41,7 @@ /** * 获取返佣积分上级类型（1=直推上级，2=直帮上级） */ private Integer superiorType; private String superiorType; /** * 核销门店可获得服务费 */ ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/StoreFallbackFactory.java
@@ -26,7 +26,7 @@ @Override public R<Shop> getStoreById(Long id) { public R<Shop> getStoreById(Integer id) { return R.fail("根据门店id查询详情:" + cause.getMessage()); } }; ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/StoreClient.java
@@ -15,7 +15,7 @@ @FeignClient(contextId = "StoreClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = StoreFallbackFactory.class) public interface StoreClient { @PostMapping(value = "/shop/getDetailById") public R<Shop> getStoreById(@RequestParam("id") Long id); R<Shop> getStoreById(@RequestParam("id") Integer id); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -496,7 +496,7 @@ @GetMapping("/change/shop") @ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"}) public R<AppUser> shop(Long id, Long shopId) { public R<AppUser> shop(Long id, Integer shopId) { AppUser byId = appUserService.getById(id); byId.setShopId(shopId); appUserService.updateById(byId); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -230,8 +230,6 @@ if (!check){ throw new ServiceException("订单不存在"); } order.setOrderStatus(OrderStatus.COMPLETED.getCode()); orderMapper.updateById(order); Integer orderType = order.getOrderType(); // 售后设置 @@ -246,9 +244,10 @@ String content = baseSetting.getContent(); JSONObject jsonObject = JSONObject.parseObject(content); Long days = jsonObject.getLong("days"); if (days != null && days > 0){ commissionService.addToCommissionDelayQueue(order.getId(), LocalDateTime.now().plusDays(days)); } order.setOrderStatus(OrderStatus.COMPLETED.getCode()); order.setIsCommission(0); order.setAfterSaleTime(LocalDateTime.now().plusDays(days)); orderMapper.updateById(order); }
@@ -108,7 +108,7 @@ @GetMapping("/getDetailById") @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"}) public R<Shop> getDetailById(@RequestParam("id") Long id){ public R<Shop> getDetailById(@RequestParam("id") Integer id){ Shop byId = shopService.getById(id); return R.ok(byId); } @@ -223,7 +223,7 @@ */ @GetMapping("/bindShop") @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"}) public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) { public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) { AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId()); appUser.setShopId(shopId); return appUserClient.editAppUserById(appUser);
