diff --git a/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java b/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java index f0b13fbd..7d6be473 100644 --- a/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java +++ b/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java @@ -14,7 +14,6 @@ import java.io.File; "co.yixiang", "com.zsw.erp" }) @EnableDubbo -@EnableScheduling public class YudaoServerApplication { public static void main(String[] args) { diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java index 5990615c..eff4cb54 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java @@ -43,6 +43,17 @@ public class AppStoreBrandController { return ApiResult.ok(yxStoreBrandService.getList()); } + /** + * 品牌馆滚动条信息 + */ + @AnonymousAccess + @GetMapping("/brandInfo") + @ApiOperation(value = "品牌馆滚动条信息",notes = "品牌馆滚动条信息") + public ApiResult getYxStoreBrandInfo(){ + + return ApiResult.ok(yxStoreBrandService.getBrandInfo()); + } + /** * 商品品牌列表按首字母分类 */ diff --git a/zsw-bxg/src/main/java/co/yixiang/constant/ShopConstants.java b/zsw-bxg/src/main/java/co/yixiang/constant/ShopConstants.java index cfaa4263..0bd93a76 100644 --- a/zsw-bxg/src/main/java/co/yixiang/constant/ShopConstants.java +++ b/zsw-bxg/src/main/java/co/yixiang/constant/ShopConstants.java @@ -101,6 +101,11 @@ public interface ShopConstants { * 关于我们 */ String ZSW_HOME_ABOUTUS = "aboutUS"; + + /** + * 品牌馆首页滚动条 + */ + String ZSW_BRAND_INDEX = "brandIndex"; /** * 首页菜单 */ diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java index aec40b87..22a789ff 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java @@ -96,7 +96,8 @@ public class YxStoreProductAttrServiceImpl extends BaseServiceImplproductFormatDto.getStock() || productFormatDto.getSeckillStock()>productFormatDto.getStock()){ - throw new BadRequestException("活动商品库存不能大于原有商品库存"); +// throw new BadRequestException("活动商品库存不能大于原有商品库存"); + throw new YshopException("活动商品库存不能大于原有商品库存"); } List stringList = new ArrayList<>(productFormatDto.getDetail().values()); Collections.sort(stringList); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index 0c3393a8..bbee39d2 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -489,7 +489,9 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl pageList = storeProductMapper.selectPage(pageModel, wrapper); - return generator.convert(pageList.getRecords(), YxStoreProductQueryVo.class); + List list=generator.convert(pageList.getRecords(), YxStoreProductQueryVo.class); + list.forEach(yxStoreProductQueryVo -> yxStoreProductQueryVo.setBrandName(storeBrandMapper.selectById(yxStoreProductQueryVo.getBrandId()).getBrandName())); + return list; } diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java index 981e101d..92eadf6c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java @@ -7,6 +7,7 @@ import co.yixiang.modules.evaluation.domain.EditableTabs; import co.yixiang.modules.product.domain.YxStoreProductAttrValue; import co.yixiang.modules.product.domain.YxStoreProductConfig; import co.yixiang.modules.product.service.dto.Parameter; +import co.yixiang.modules.store.vo.YxStoreBrandVo; import co.yixiang.serializer.BigDecimalSerializer; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; @@ -165,6 +166,9 @@ public class YxStoreProductQueryVo implements Serializable { @ApiModelProperty(value = "是否单独分佣") private Integer isSub; + @ApiModelProperty(value = "品牌信息") + private YxStoreBrandVo brandInfo; + /** 规格 0单 1多 */ @ApiModelProperty(value = "规格 0单 1多 ") private Integer specType; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java index f92f73af..517b6499 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java @@ -53,4 +53,7 @@ public interface YxStoreBrandService extends BaseService { void download(List all, HttpServletResponse response) throws IOException; BrandDTO getYxStoreBrandById(String id); + + //获取品牌馆首页滚动条信息 + Object getBrandInfo(); } diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java index 87300d04..8b551111 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java @@ -9,15 +9,20 @@ package co.yixiang.modules.store.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.iocoder.yudao.framework.common.pojo.ApiResult; +import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.constant.ShopConstants; import co.yixiang.domain.PageResult; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ShopCommonEnum; +import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.store.domain.YxStoreBrand; import co.yixiang.modules.store.service.dto.YxStoreBrandNameDto; import co.yixiang.utils.FileUtil; import co.yixiang.utils.BrandDTO; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; import com.github.pagehelper.PageInfo; @@ -52,6 +57,7 @@ public class YxStoreBrandServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(); +// map.put("brandIndex", JSONObject.parseObject(systemConfigService.getData(ShopConstants.ZSW_BRAND_INDEX))); + return JSONObject.parseObject(systemConfigService.getData(ShopConstants.ZSW_BRAND_INDEX)); + } } diff --git a/zsw-bxg/src/main/java/co/yixiang/utils/WxbotMsgUtil.java b/zsw-bxg/src/main/java/co/yixiang/utils/WxbotMsgUtil.java index 572caef0..1861f068 100644 --- a/zsw-bxg/src/main/java/co/yixiang/utils/WxbotMsgUtil.java +++ b/zsw-bxg/src/main/java/co/yixiang/utils/WxbotMsgUtil.java @@ -8,7 +8,6 @@ import co.yixiang.event.TemplateEvent; import co.yixiang.event.TemplateListenEnum; import co.yixiang.modules.activity.domain.YxStoreCouponUser; import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper; -import co.yixiang.modules.activity.vo.StoreCouponUserVo; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.dto.YxStoreOrderDto; import co.yixiang.modules.shop.service.YxSystemConfigService; @@ -25,6 +24,7 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -34,6 +34,7 @@ import java.util.*; @Component @Slf4j +@Lazy(false) public class WxbotMsgUtil { @Autowired @@ -49,8 +50,12 @@ public class WxbotMsgUtil { private ApplicationEventPublisher publisher; //定时器,每天下午17点触发 - @Scheduled(cron = "0 0 15 * * ?") + @Scheduled(cron = "0 0 17 * * ?") public void scheduled(){ + log.info("=====>>>>>使用cron {}",System.currentTimeMillis()); + log.info("=====>>>>>使用cron {}",System.currentTimeMillis()); + log.info("=====>>>>>使用cron {}",System.currentTimeMillis()); + log.info("=====>>>>>使用cron {}",System.currentTimeMillis()); log.info("=====>>>>>使用cron {}",System.currentTimeMillis()); //查出所有用户拥有的券使用时间小于24小时且未使用的券 Date now=new Date();