From 37a5e014434e537111e79fca174b7a9e01b7a9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 26 Jul 2024 02:48:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=95=86=E5=93=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/controller/GoodsController.java | 55 ++--- .../java/com/gxwebsoft/shop/entity/Goods.java | 42 ++-- .../com/gxwebsoft/shop/entity/GoodsSpec.java | 2 +- .../gxwebsoft/shop/mapper/GoodsMapper.java | 2 +- .../gxwebsoft/shop/mapper/xml/GoodsMapper.xml | 210 ++++++++++-------- .../shop/mapper/xml/GoodsSpecMapper.xml | 4 +- .../com/gxwebsoft/shop/param/GoodsParam.java | 50 ++++- .../gxwebsoft/shop/param/GoodsSpecParam.java | 2 +- .../gxwebsoft/shop/service/GoodsService.java | 2 +- .../shop/service/impl/GoodsServiceImpl.java | 30 ++- .../service/impl/GoodsSpecServiceImpl.java | 4 +- .../gxwebsoft/shop/task/OrderInfoTask.java | 4 +- .../com/gxwebsoft/shop/task/OrderTask.java | 2 +- .../gxwebsoft/generator/ShopGenerator.java | 4 +- 14 files changed, 236 insertions(+), 177 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java index 7f5d2b9..c45ca4a 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java @@ -1,13 +1,10 @@ package com.gxwebsoft.shop.controller; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.oa.entity.App; import com.gxwebsoft.shop.entity.GoodsSku; import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.entity.SpecValue; import com.gxwebsoft.shop.service.GoodsService; import com.gxwebsoft.shop.entity.Goods; import com.gxwebsoft.shop.param.GoodsParam; @@ -21,22 +18,19 @@ import com.gxwebsoft.shop.service.GoodsSkuService; import com.gxwebsoft.shop.service.GoodsSpecService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.tomcat.util.buf.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 商品记录表控制器 * * @author 科技小王子 - * @since 2024-03-30 20:00:50 + * @since 2024-07-25 19:22:01 */ @Api(tags = "商品记录表管理") @RestController @@ -73,36 +67,27 @@ public class GoodsController extends BaseController { return success(data); } - @ApiOperation("分页查询商品记录表") - @GetMapping("/page") - public ApiResult> page(GoodsParam param) { - // 使用关联查询 - return success(goodsService.pageRel(param)); - } - - @ApiOperation("查询全部商品记录表") - @GetMapping() - public ApiResult> list(GoodsParam param) { - // 使用关联查询 - return success(goodsService.listRel(param)); - } - - @Transactional(rollbackFor = {Exception.class}) - @ApiOperation("根据id查询商品记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - final Goods goods = goodsService.getByIdRel(id); - final List goodsSpecList = goodsSpecService.list(new LambdaQueryWrapper().eq(GoodsSpec::getGoodsId, id)); - final List goodsSkuList = goodsSkuService.list(new LambdaQueryWrapper().eq(GoodsSku::getGoodsId, id)); - if(goodsSpecList != null){ - goods.setGoodsSpecs(goodsSpecList); + @ApiOperation("分页查询商品记录表") + @GetMapping("/page") + public ApiResult> page(GoodsParam param) { + // 使用关联查询 + return success(goodsService.pageRel(param)); } - if(goodsSkuList != null){ - goods.setGoodsSkus(goodsSkuList); + + @ApiOperation("查询全部商品记录表") + @GetMapping() + public ApiResult> list(GoodsParam param) { + // 使用关联查询 + return success(goodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:goods:list')") + @ApiOperation("根据id查询商品记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsService.getByIdRel(id)); } - return success(goods); - } @PreAuthorize("hasAuthority('shop:goods:save')") @ApiOperation("添加商品记录表") diff --git a/src/main/java/com/gxwebsoft/shop/entity/Goods.java b/src/main/java/com/gxwebsoft/shop/entity/Goods.java index 1a9fbaa..374f7e8 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/Goods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Goods.java @@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode; * 商品记录表 * * @author 科技小王子 - * @since 2024-03-30 20:00:50 + * @since 2024-07-25 19:22:01 */ @Data @EqualsAndHashCode(callSuper = false) @@ -37,7 +37,7 @@ public class Goods implements Serializable { @ApiModelProperty(value = "商品编码") private String code; - @ApiModelProperty(value = "商品名称") + @ApiModelProperty(value = "商品标题") private String goodsName; @ApiModelProperty(value = "商品封面图") @@ -46,10 +46,7 @@ public class Goods implements Serializable { @ApiModelProperty(value = "商品详情") private String content; - @ApiModelProperty(value = "商品附件") - private String files; - - @ApiModelProperty(value = "分类ID") + @ApiModelProperty(value = "商品分类ID") private Integer categoryId; @ApiModelProperty(value = "一级分类") @@ -64,31 +61,46 @@ public class Goods implements Serializable { @ApiModelProperty(value = "货架") private String position; + @ApiModelProperty(value = "单位名称") + private String unitName; + + @ApiModelProperty(value = "消费赚取积分") + private BigDecimal gainIntegral; + @ApiModelProperty(value = "进货价格") private BigDecimal price; @ApiModelProperty(value = "销售价格") private BigDecimal salePrice; + @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") + private Integer deductStockType; + + @ApiModelProperty(value = "封面图") + private String files; + @ApiModelProperty(value = "销量") private Integer sales; @ApiModelProperty(value = "库存") private Integer stock; - @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") - private Integer deductStockType; - @ApiModelProperty(value = "商品重量") private Integer goodsWeight; @ApiModelProperty(value = "推荐") private Integer recommend; - @ApiModelProperty(value = "1上架 0下架") + @ApiModelProperty(value = "商户ID") + private Integer merchantId; + + @ApiModelProperty(value = "商户名称") + private String merchantName; + + @ApiModelProperty(value = "状态（0：未上架，1：上架）") private Integer isShow; - @ApiModelProperty(value = "状态, 0上架 1下架 2待审核 3审核不通过") + @ApiModelProperty(value = "状态, 0上架 1待上架 2待审核 3审核不通过") private Integer status; @ApiModelProperty(value = "备注") @@ -97,15 +109,9 @@ public class Goods implements Serializable { @ApiModelProperty(value = "排序号") private Integer sortNumber; - @ApiModelProperty(value = "所有人") + @ApiModelProperty(value = "用户ID") private Integer userId; - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - @ApiModelProperty(value = "是否删除, 0否, 1是") @TableLogic private Integer deleted; diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsSpec.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsSpec.java index 52bb400..bd18a88 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsSpec.java +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsSpec.java @@ -39,7 +39,7 @@ public class GoodsSpec implements Serializable { private String specName; @ApiModelProperty(value = "规格值") - private String specValues; + private String specValue; @ApiModelProperty(value = "规格值") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java index c6ca610..67926e1 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 商品记录表Mapper * * @author 科技小王子 - * @since 2024-03-30 20:00:50 + * @since 2024-07-25 19:22:01 */ public interface GoodsMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml index 421c5b8..32873fe 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml @@ -2,103 +2,121 @@ - - - SELECT a.* - FROM shop_goods a - - - AND a.goods_id = #{param.goodsId} - - - AND a.type = #{param.type} - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.category_id = #{param.categoryId} - - - AND a.category_id IN (SELECT category_id FROM shop_goods_category WHERE parent_id=#{param.parentId}) - - - AND a.category_parent LIKE CONCAT('%', #{param.categoryParent}, '%') - - - AND a.category_children LIKE CONCAT('%', #{param.categoryChildren}, '%') - - - AND a.specs LIKE CONCAT('%', #{param.specs}, '%') - - - AND a.position LIKE CONCAT('%', #{param.position}, '%') - - - AND a.price = #{param.price} - - - AND a.sale_price = #{param.salePrice} - - - AND a.recommend = #{param.recommend} - - - AND a.is_show = #{param.isShow} - - - AND a.status = #{param.status} - - - AND a.stock = #{param.stock} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.merchant_id = #{param.merchantId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR a.goods_name = #{param.keywords} - OR a.code = #{param.keywords} - ) - - - + + + SELECT a.* + FROM shop_goods a + + + AND a.goods_id = #{param.goodsId} + + + AND a.type = #{param.type} + + + AND a.code LIKE CONCAT('%', #{param.code}, '%') + + + AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.category_id = #{param.categoryId} + + + AND a.category_parent LIKE CONCAT('%', #{param.categoryParent}, '%') + + + AND a.category_children LIKE CONCAT('%', #{param.categoryChildren}, '%') + + + AND a.specs = #{param.specs} + + + AND a.position LIKE CONCAT('%', #{param.position}, '%') + + + AND a.price = #{param.price} + + + AND a.sale_price = #{param.salePrice} + + + AND a.deduct_stock_type = #{param.deductStockType} + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.sales = #{param.sales} + + + AND a.stock = #{param.stock} + + + AND a.goods_weight = #{param.goodsWeight} + + + AND a.recommend = #{param.recommend} + + + AND a.merchant_id = #{param.merchantId} + + + AND a.category_id IN (SELECT category_id FROM shop_goods_category WHERE parent_id=#{param.parentId}) + + + AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND a.is_show = #{param.isShow} + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + OR a.goods_name = #{param.keywords} + OR a.code = #{param.keywords} + ) + + + - - + + - - + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSpecMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSpecMapper.xml index e473380..4d7b7c0 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSpecMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSpecMapper.xml @@ -19,8 +19,8 @@ AND a.spec_name LIKE CONCAT('%', #{param.specName}, '%') - - AND a.value_list LIKE CONCAT('%', #{param.valueList}, '%') + + AND a.spec_value LIKE CONCAT('%', #{param.specValue}, '%') AND a.type = #{param.type} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java index ee089ce..81c44d6 100644 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java @@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode; * 商品记录表查询参数 * * @author 科技小王子 - * @since 2024-03-30 20:00:50 + * @since 2024-07-25 19:22:01 */ @Data @EqualsAndHashCode(callSuper = false) @@ -36,13 +36,16 @@ public class GoodsParam extends BaseParam { @ApiModelProperty(value = "商品编码") private String code; - @ApiModelProperty(value = "商品名称") + @ApiModelProperty(value = "商品标题") private String goodsName; + @ApiModelProperty(value = "商品封面图") + private String image; + @ApiModelProperty(value = "商品详情") private String content; - @ApiModelProperty(value = "分类ID") + @ApiModelProperty(value = "商品分类ID") @QueryField(type = QueryType.EQ) private Integer categoryId; @@ -52,7 +55,8 @@ public class GoodsParam extends BaseParam { @ApiModelProperty(value = "二级分类") private String categoryChildren; - @ApiModelProperty(value = "规格") + @ApiModelProperty(value = "商品规格 0单规格 1多规格") + @QueryField(type = QueryType.EQ) private Integer specs; @ApiModelProperty(value = "货架") @@ -66,22 +70,44 @@ public class GoodsParam extends BaseParam { @QueryField(type = QueryType.EQ) private BigDecimal salePrice; - @ApiModelProperty(value = "推荐") + @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") @QueryField(type = QueryType.EQ) - private Integer recommend; + private Integer deductStockType; - @ApiModelProperty(value = "1上架 0下架") - @QueryField(type = QueryType.EQ) - private Integer isShow; + @ApiModelProperty(value = "封面图") + private String files; - @ApiModelProperty(value = "状态, 0上架 1下架 2待审核 3审核不通过") + @ApiModelProperty(value = "销量") @QueryField(type = QueryType.EQ) - private Integer status; + private Integer sales; @ApiModelProperty(value = "库存") @QueryField(type = QueryType.EQ) private Integer stock; + @ApiModelProperty(value = "商品重量") + @QueryField(type = QueryType.EQ) + private Integer goodsWeight; + + @ApiModelProperty(value = "推荐") + @QueryField(type = QueryType.EQ) + private Integer recommend; + + @ApiModelProperty(value = "商户ID") + @QueryField(type = QueryType.EQ) + private Integer merchantId; + + @ApiModelProperty(value = "商户名称") + private String merchantName; + + @ApiModelProperty(value = "状态（0：未上架，1：上架）") + @QueryField(type = QueryType.EQ) + private Integer isShow; + + @ApiModelProperty(value = "状态, 0上架 1待上架 2待审核 3审核不通过") + @QueryField(type = QueryType.EQ) + private Integer status; + @ApiModelProperty(value = "备注") private String comments; @@ -89,7 +115,7 @@ public class GoodsParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer sortNumber; - @ApiModelProperty(value = "所有人") + @ApiModelProperty(value = "用户ID") @QueryField(type = QueryType.EQ) private Integer userId; diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsSpecParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsSpecParam.java index 1c5bde9..d93bf87 100644 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsSpecParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsSpecParam.java @@ -39,7 +39,7 @@ public class GoodsSpecParam extends BaseParam { private String specName; @ApiModelProperty(value = "规格值") - private String valueList; + private String specValue; @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") @QueryField(type = QueryType.EQ) diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java index 45be85d..96bdbfa 100644 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsService.java +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java @@ -11,7 +11,7 @@ import java.util.List; * 商品记录表Service * * @author 科技小王子 - * @since 2024-03-30 20:00:50 + * @since 2024-07-25 19:22:01 */ public interface GoodsService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java index 55bd2ed..94bcba8 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java @@ -20,13 +20,15 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** * 商品记录表Service实现 * * @author 科技小王子 - * @since 2024-03-30 20:00:50 + * @since 2024-07-25 19:22:01 */ @Service public class GoodsServiceImpl extends ServiceImpl implements GoodsService { @@ -40,6 +42,18 @@ public class GoodsServiceImpl extends ServiceImpl implements PageParam page = new PageParam<>(param); page.setDefaultOrder("sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); + final Set goodsIds = list.stream().map(Goods::getGoodsId).collect(Collectors.toSet()); + if (!CollectionUtils.isEmpty(goodsIds)) { + final List specs = goodsSpecService.list(new LambdaQueryWrapper().in(GoodsSpec::getGoodsId, goodsIds)); + final List skus = goodsSkuService.list(new LambdaQueryWrapper().in(GoodsSku::getGoodsId, goodsIds)); + final Map> collectSpecs = specs.stream().collect(Collectors.groupingBy(GoodsSpec::getGoodsId)); + final Map> collectSkus = skus.stream().collect(Collectors.groupingBy(GoodsSku::getGoodsId)); + list.forEach(d -> { + d.setGoodsSpecs(collectSpecs.get(d.getGoodsId())); + d.setGoodsSkus(collectSkus.get(d.getGoodsId())); + }); + } + return new PageResult<>(list, page.getTotal()); } @@ -66,11 +80,21 @@ public class GoodsServiceImpl extends ServiceImpl implements if (!CollectionUtils.isEmpty(goodsSpecs)) { goodsSpecs.forEach(d -> { d.setGoodsId(goods.getGoodsId()); - final List collect = d.getValueList().stream().map(SpecValue::getSpecValue).collect(Collectors.toList()); - d.setSpecValues(StringUtils.join(collect, ',')); }); goodsSpecService.saveBatch(goodsSpecs); +// final GoodsSpec spec = goodsSpecs.get(0); +// if (spec != null) { +// final GoodsSpec goodsSpec = new GoodsSpec(); +// goodsSpec.setGoodsId(goods.getGoodsId()); +// goodsSpec.setSpecId(spec.getSpecId()); +// goodsSpec.setSpecName(spec.getSpecName()); +// goodsSpec.setSpecValue(spec.getSpecValue()); +// goodsSpec.setTenantId(goods.getTenantId()); +// System.out.println("goodsSpec = " + goodsSpec); +// goodsSpecService.save(goodsSpec); +// } } + // 保存商品sku表 final List goodsSkus = goods.getGoodsSkus(); if (!CollectionUtils.isEmpty(goodsSkus)) { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java index 474a02b..c58a7e8 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java @@ -23,7 +23,7 @@ public class GoodsSpecServiceImpl extends ServiceImpl pageRel(GoodsSpecParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("id desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +33,7 @@ public class GoodsSpecServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("id desc"); return page.sortRecords(list); } diff --git a/src/main/java/com/gxwebsoft/shop/task/OrderInfoTask.java b/src/main/java/com/gxwebsoft/shop/task/OrderInfoTask.java index d48042c..5344637 100644 --- a/src/main/java/com/gxwebsoft/shop/task/OrderInfoTask.java +++ b/src/main/java/com/gxwebsoft/shop/task/OrderInfoTask.java @@ -34,7 +34,7 @@ public class OrderInfoTask extends BaseController { /** * 自动处理过期订单任务 */ - @Scheduled(cron="*/10 * * * * *") +// @Scheduled(cron="*/10 * * * * *") @Transactional(rollbackFor = {Exception.class}) public void settledExpirationOrder() { final Order order = new Order(); @@ -57,7 +57,7 @@ public class OrderInfoTask extends BaseController { * 自动处理过期订单任务(游泳馆专用) * Scheduled(cron="0 30 21 * * ?") */ - @Scheduled(cron="*/30 * * * * *") +// @Scheduled(cron="*/30 * * * * *") @Transactional(rollbackFor = {Exception.class}) public void settledExpirationOrderBy3028() { final Order order = new Order(); diff --git a/src/main/java/com/gxwebsoft/shop/task/OrderTask.java b/src/main/java/com/gxwebsoft/shop/task/OrderTask.java index ff76757..7a4a1e8 100644 --- a/src/main/java/com/gxwebsoft/shop/task/OrderTask.java +++ b/src/main/java/com/gxwebsoft/shop/task/OrderTask.java @@ -32,7 +32,7 @@ public class OrderTask extends BaseController { /** * 自动处理过期订单任务 */ - @Scheduled(fixedDelay = 2000, initialDelay = 2000) +// @Scheduled(fixedDelay = 2000, initialDelay = 2000) @Transactional(rollbackFor = {Exception.class}) public void settledExpirationOrder() { final OrderParam p = new OrderParam(); diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index 7d88ff2..9694280 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -48,9 +48,9 @@ public class ShopGenerator { private static final String MODULE_NAME = "shop"; // 需要生成的表 private static final String[] TABLE_NAMES = new String[]{ - "shop_spec", +// "shop_spec", // "shop_spec_value", -// "shop_goods", + "shop_goods", // "shop_goods_spec", // "shop_goods_sku", // "shop_goods_category",