ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java
@@ -32,7 +32,7 @@ @ApiModelProperty(value = "主键") @TableId("id") private Long id; private Integer id; @ApiModelProperty(value = "用户id") @TableField("app_user_id") @@ -40,7 +40,7 @@ @ApiModelProperty(value = "技师id") @TableField("technician_id") private Long technicianId; private Integer technicianId; @ApiModelProperty(value = "预约时间") @TableField("subscribe_time") @@ -77,7 +77,7 @@ private String idStr; public void setId(Long id) { public void setId(Integer id) { this.id = id; this.idStr = String.valueOf(id); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -86,7 +86,7 @@ return R.fail("售后取消失败"); } refundPass.setDelFlag(1); refundPassService.updateById(refundPass); refundPassService.removeById(id); order.setOrderStatus(4); orderService.updateById(order); return R.ok(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -113,7 +113,7 @@ @GetMapping("/getVerifiableShop") @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"}) public R<List<VerifiableShopVo>> getVerifiableShop(){ LoginUser loginUser = tokenService.getLoginUser(); LoginUser loginUser = tokenService.getLoginUserApplet(); List<ShoppingCart> shoppingCarts = shoppingCartService.list(new LambdaQueryWrapper<ShoppingCart>() .eq(ShoppingCart::getAppUserId, loginUser.getUserid()));
@@ -812,7 +812,7 @@ order.setGoodName(goodName.substring(0, goodName.length() - 1)); Goods goods = goodsClient.getGoodsById(goodsList.get(0).getGoodsId()).getData(); order.setOrderType(goods.getType()); order.setOrderStatus(1); order.setOrderStatus(goods.getType() == 1 ? 3 : 1); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS"); order.setOrderNumber("QJS" + getNumber(3) + sdf.format(new Date())); order.setTotalAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN)); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -3,16 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.other.api.domain.GoodsCategory; import com.ruoyi.other.service.GoodsCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -57,16 +55,11 @@ @GetMapping("/getList") @ApiOperation(value = "商品分类列表", tags = {"管理后台-商品分类"}) @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "分类名称", required = true, dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "current", value = "当前页码，从1开始", required = true, dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "size", value = "每页显示数量，默认10", dataType = "Integer", paramType = "query") }) public R<TableDataInfo<GoodsCategory>> list(IPage<GoodsCategory> page, GoodsCategory goodsCategory){ startPage(); List<GoodsCategory> list = goodsCategoryService.list(new LambdaQueryWrapper<GoodsCategory>() .eq(StringUtils.isNotEmpty(goodsCategory.getName()), GoodsCategory::getName, goodsCategory.getName())); return R.ok(getDataTable(list)); public R<Page<GoodsCategory>> list(@ApiParam("页码") @RequestParam Integer PageNum,@ApiParam("每一页数据大小") Integer pageSize, GoodsCategory goodsCategory){ Page<GoodsCategory> page = goodsCategoryService.lambdaQuery() .like(StringUtils.isNotEmpty(goodsCategory.getName()),GoodsCategory::getName, goodsCategory.getName()) .page(Page.of(PageNum, pageSize)); return R.ok(page); } @GetMapping("/index/list") ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -55,7 +55,7 @@ technicianSubscribeMapper.insert(subscribe); } if (subscribe.getTechnicianId() != null){ orderGoodsClient.subscribe(subscribe.getOrderId(), Math.toIntExact(subscribe.getId())); orderGoodsClient.subscribe(subscribe.getOrderId(), subscribe.getTechnicianId()); } }
