From 967159b79214a4298cce9d3742b340e8e6ebb2b1 Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Thu, 18 May 2023 20:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BC=98=E5=8C=96=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cereshop/admin/controller/AdminController.java | 10 +- .../cereshop/admin/controller/ShopController.java | 1 + .../product/impl/CereShopProductServiceImpl.java | 22 ++- .../com/shop/cereshop/admin/utils/ContextUtil.java | 4 +- .../mybatis/mapper/shop/CerePlatformShopDAO.xml | 10 +- .../app/controller/canvas/CanvasController.java | 13 +- .../controller/classify/ClassifyController.java | 17 ++ .../app/controller/order/OrderController.java | 9 +- .../app/controller/product/ProductController.java | 4 +- .../cereshop/app/dao/cart/CereShopCartDAO.java | 2 + .../app/dao/product/CereProductClassifyDAO.java | 8 + .../app/dao/product/CereShopProductDAO.java | 16 ++ .../cereshop/app/dao/shop/CerePlatformShopDAO.java | 6 + .../app/page/canvas/CanvasProductNumber.java | 33 ++++ .../cereshop/app/page/canvas/CanvasProductSku.java | 57 +++++++ .../app/page/canvas/CanvasProductUsers.java | 34 ++++ .../shop/cereshop/app/page/index/ProductImage.java | 33 ++++ .../cereshop/app/page/product/ProductDetail.java | 10 +- .../cereshop/app/param/order/OrderGetAllParam.java | 5 + .../app/pay/xs/service/impl/XsPayServiceImpl.java | 12 +- .../service/cart/impl/CereShopCartServiceImpl.java | 7 +- .../product/CereProductClassifyService.java | 2 + .../service/product/CereShopProductService.java | 2 + .../impl/CereProductClassifyServiceImpl.java | 52 +++++- .../product/impl/CereShopProductServiceImpl.java | 86 +++++++++- .../shop/cereshop/app/utils/DistributionUtil.java | 3 +- .../com/shop/cereshop/app/utils/WechatUtil.java | 4 +- .../mybatis/mapper/order/CereShopOrderDAO.xml | 1 + .../mapper/product/CereProductClassifyDAO.xml | 61 +++++++ .../mybatis/mapper/product/CereShopProductDAO.xml | 185 +++++++++++++++++++++ .../mybatis/mapper/shop/CerePlatformShopDAO.xml | 21 +++ cereshop-business/cert/.gitkeep | 0 cereshop-business/cert/wechat/.gitkeep | 0 .../controller/BusinessUserController.java | 1 + .../business/controller/PermissionController.java | 1 + .../business/controller/RoleController.java | 1 + .../business/dao/tool/CereShopCouponDAO.java | 4 +- .../dao/tool/CereShopCouponExcludeDAO.java | 19 +++ .../business/dao/tool/CereShopDiscountDAO.java | 2 +- .../business/dao/tool/CereShopGroupWorkDAO.java | 2 +- .../business/dao/tool/CereShopSeckillDAO.java | 2 +- .../business/page/tool/ShopCouponDetail.java | 6 + .../cereshop/business/page/tool/ToolProduct.java | 12 ++ .../business/param/tool/ToolProductParam.java | 12 ++ .../impl/CerePlatformPermissionServiceImpl.java | 1 + .../tool/impl/CereShopCouponServiceImpl.java | 37 ++++- .../tool/impl/CereShopDiscountServiceImpl.java | 2 +- .../tool/impl/CereShopGroupWorkServiceImpl.java | 2 +- .../tool/impl/CereShopSeckillServiceImpl.java | 2 +- .../mybatis/mapper/log/CerePlatformWebLogDAO.xml | 148 +++++++++++++++++ .../mybatis/mapper/tool/CereShopCouponDAO.xml | 14 +- .../mapper/tool/CereShopCouponExcludeDAO.xml | 15 ++ .../mybatis/mapper/tool/CereShopDiscountDAO.xml | 9 +- .../mybatis/mapper/tool/CereShopGroupWorkDAO.xml | 7 + .../mybatis/mapper/tool/CereShopSeckillDAO.xml | 7 + .../commons/domain/tool/CereShopCouponExclude.java | 33 ++++ .../commons/utils/KdniaoTrackQueryAPI.java | 4 +- .../cereshop/commons/utils/ProjectInvokeUtil.java | 4 +- doc/2.0/update.sql | 3 + 59 files changed, 1029 insertions(+), 51 deletions(-) create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/page/canvas/CanvasProductNumber.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/page/canvas/CanvasProductSku.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/page/canvas/CanvasProductUsers.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/page/index/ProductImage.java create mode 100644 cereshop-business/cert/.gitkeep create mode 100644 cereshop-business/cert/wechat/.gitkeep create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponExcludeDAO.java create mode 100644 cereshop-business/src/main/resources/mybatis/mapper/log/CerePlatformWebLogDAO.xml create mode 100644 cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponExcludeDAO.xml create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/tool/CereShopCouponExclude.java diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdminController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdminController.java index 495b035..50658e5 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdminController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdminController.java @@ -116,7 +116,7 @@ public class AdminController { } CerePlatformUser user = null; if (!EmptyUtils.isEmpty(param.getCode())) { - if (!param.getCode().equals("9999")) { + if (!param.getCode().equals("9999") || noDemoAccount(param)) { //手机号登录,校验验证码 String code = (String) stringRedisService.get(param.getUsername()); if (!param.getCode().equals(code)) { @@ -162,6 +162,14 @@ public class AdminController { return new Result(user); } + private boolean noDemoAccount(UserLoginParam param) { + CerePlatformUser user = cerePlatformUserService.findById(1L); + if (user.getPhone().equals(param.getUsername())) { + return false; + } + return true; + } + // @GetMapping("bigReq") // public Result bigReqList() { // List result = new ArrayList<>(2048); diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopController.java index f49f8d4..b8f1407 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopController.java @@ -145,6 +145,7 @@ public class ShopController { @PostMapping(value = "cleanShop") @ApiOperation(value = "注销商家数据") public Result cleanShop(@RequestBody ShopGetByIdParam param) throws CoBusinessException{ + ContextUtil.interceptDelete(); Boolean result = cerePlatformShopService.cleanShop(param.getShopId()); return new Result(result); } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductServiceImpl.java index 41eabdb..6b91ed1 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductServiceImpl.java @@ -191,15 +191,19 @@ public class CereShopProductServiceImpl implements CereShopProductService { @Override public void setFictitious(ProductUpdateParam param, CerePlatformUser user) throws CoBusinessException { String time = TimeUtils.yyMMddHHmmss(); - - CereShopProduct cereShopProduct=new CereShopProduct(); - cereShopProduct.setProductId(param.getProductId()); - cereShopProduct.setFictitiousNumber(param.getFictitiousNumber()); - cereShopProduct.setUpdateTime(time); - cereShopProductDAO.updateByPrimaryKeySelective(cereShopProduct); - //新增日志 - cerePlatformLogService.addLog(user,"商品管理","平台端操作","设置虚拟销量",String.valueOf(cereShopProduct.getProductId()),time); - + HttpResult result = projectInvokeUtil.postRefreshSkuRealInfo(param.getProductId(), null, + RefreshSkuRealInfoSourceEnum.EDIT_FICTITIOUS_NUMBER, param.getFictitiousNumber()); + if (result.getStatus() == 200) { + CereShopProduct cereShopProduct=new CereShopProduct(); + cereShopProduct.setProductId(param.getProductId()); + cereShopProduct.setFictitiousNumber(param.getFictitiousNumber()); + cereShopProduct.setUpdateTime(time); + cereShopProductDAO.updateByPrimaryKeySelective(cereShopProduct); + //新增日志 + cerePlatformLogService.addLog(user,"商品管理","平台端操作","设置虚拟销量",String.valueOf(cereShopProduct.getProductId()),time); + } else { + throw new CoBusinessException(CoReturnFormat.SYS_ERROR); + } } @Override diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/utils/ContextUtil.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/utils/ContextUtil.java index 6ab5e96..9f0bc26 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/utils/ContextUtil.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/utils/ContextUtil.java @@ -23,8 +23,8 @@ public class ContextUtil { } public static boolean getAdmin(){ - return false; - //return adminTL.get() != null && adminTL.get(); + //return false; + return adminTL.get() != null && adminTL.get(); } public static void interceptDelete() throws CoBusinessException { diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml index 90aa209..b8b57aa 100644 --- a/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml +++ b/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml @@ -314,15 +314,15 @@ b.business_user_id FROM cere_platform_shop a, cere_platform_business b - where a.shop_phone = b.username + where a.charge_person_phone = b.phone and shop_id = #{shopId} + + + + diff --git a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml index 94a55d8..f86b24f 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml @@ -21,6 +21,26 @@ + + + + + + + + + + + + + + + + + + + + product_id, shop_id, product_name, product_brief, shop_group_id, classify_id, supplier_id, supplier_name, if_logistics, shelve_state, if_oversold,fictitious_number, create_time, update_time,product_text,reject @@ -403,6 +423,171 @@ ORDER BY a.create_time DESC + + + + + + + + + + + diff --git a/cereshop-business/cert/.gitkeep b/cereshop-business/cert/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/cereshop-business/cert/wechat/.gitkeep b/cereshop-business/cert/wechat/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/BusinessUserController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/BusinessUserController.java index 3bbfbbe..32eceec 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/BusinessUserController.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/BusinessUserController.java @@ -121,6 +121,7 @@ public class BusinessUserController { @ApiOperation(value = "删除用户") @NoRepeatWebLog public Result delete(@RequestBody BusinessDeleteUser param, HttpServletRequest request) throws CoBusinessException{ + ContextUtil.interceptDelete(); //获取当前登录账户 CerePlatformBusiness user = (CerePlatformBusiness) request.getAttribute("user"); cerePlatformBusinessService.delete(param,user); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/PermissionController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/PermissionController.java index 81ef8e9..884356b 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/PermissionController.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/PermissionController.java @@ -87,6 +87,7 @@ public class PermissionController { @ApiOperation(value = "删除菜单权限") @NoRepeatWebLog public Result delete(@RequestBody PermissionDeleteParam param, HttpServletRequest request) throws CoBusinessException{ + ContextUtil.interceptDelete(); //获取当前登录账户 CerePlatformBusiness user = (CerePlatformBusiness) request.getAttribute("user"); cerePlatformPermissionService.delete(param,user); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/RoleController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/RoleController.java index b8d2703..3c7df38 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/RoleController.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/RoleController.java @@ -89,6 +89,7 @@ public class RoleController { @ApiOperation(value = "删除角色") @NoRepeatWebLog public Result delete(@RequestBody RoleDeleteParam param, HttpServletRequest request) throws CoBusinessException{ + ContextUtil.interceptDelete(); //获取当前登录账户 CerePlatformBusiness user = (CerePlatformBusiness) request.getAttribute("user"); cerePlatformRoleService.delete(param,user); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java index 5b36ba7..d52a09e 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java @@ -35,7 +35,9 @@ public interface CereShopCouponDAO extends BaseMapper { List getAll(ShopCouponGetAllParam param); - List getProducts(@Param("shopId") Long shopId); + List getProducts(@Param("shopId") Long shopId, + @Param("shopCouponId") Long shopCouponId, + @Param("queryType") Integer queryType); List selectCoupon(OperateCouponParam param); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponExcludeDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponExcludeDAO.java new file mode 100644 index 0000000..6ebfe89 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponExcludeDAO.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.business.dao.tool; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.tool.CereShopCouponExclude; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CereShopCouponExcludeDAO extends BaseMapper { + + int insertBatch(List list); + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopDiscountDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopDiscountDAO.java index 8debb72..9bde159 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopDiscountDAO.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopDiscountDAO.java @@ -35,7 +35,7 @@ public interface CereShopDiscountDAO extends BaseMapper { List getAll(ShopDiscountGetAllParam param); - List getProducts(@Param("shopId") Long shopId); + List getProducts(@Param("shopId") Long shopId, @Param("shopDiscountId") Long shopDiscountId); List findDataProducts(@Param("shopDiscountId") Long shopDiscountId,@Param("shopId") Long shopId); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopGroupWorkDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopGroupWorkDAO.java index c0b6747..8d67f7f 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopGroupWorkDAO.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopGroupWorkDAO.java @@ -32,7 +32,7 @@ public interface CereShopGroupWorkDAO extends BaseMapper { ShopGroupWorkUDetail getById(@Param("shopGroupWorkId") Long shopGroupWorkId); - List getProducts(@Param("shopId") Long shopId); + List getProducts(@Param("shopId") Long shopId, @Param("shopGroupWorkId") Long shopGroupWorkId); List getAll(ShopGroupWorkGetAllParam param); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopSeckillDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopSeckillDAO.java index 7eb51b8..c88b7f0 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopSeckillDAO.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopSeckillDAO.java @@ -35,7 +35,7 @@ public interface CereShopSeckillDAO extends BaseMapper { List getAll(ShopSeckillGetAllParam param); - List getProducts(@Param("shopId") Long shopId); + List getProducts(@Param("shopId") Long shopId, @Param("shopSeckillId") Long shopSeckillId); List findDataProducts(@Param("shopSeckillId") Long shopSeckillId,@Param("shopId") Long shopId); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ShopCouponDetail.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ShopCouponDetail.java index 6dbae3b..6b7f5fb 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ShopCouponDetail.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ShopCouponDetail.java @@ -147,6 +147,12 @@ public class ShopCouponDetail implements Serializable { @ApiModelProperty(value = "选中商品数据") private List products; + /** + * 指定商品不可用列表 + */ + @ApiModelProperty(value = "指定商品不可用列表") + private List excludeIds; + private static final long serialVersionUID = 1L; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java index 9ea3038..dfd53b1 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java @@ -95,4 +95,16 @@ public class ToolProduct { */ @ApiModelProperty(value = "已拼人数") private Integer workUsers; + + /** + * 拼团的拼团价 + */ + @ApiModelProperty(value = "拼团的拼团价") + private BigDecimal workPrice; + + /** + * 秒杀的直降多少元 + */ + @ApiModelProperty(value = "秒杀的直降多少元") + private BigDecimal downPrice; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductParam.java index 3f1bf63..f2e9ef6 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductParam.java @@ -22,4 +22,16 @@ public class ToolProductParam extends PageParam { */ @ApiModelProperty(value = "店铺id") private Long shopId; + + /** + * 活动id + */ + @ApiModelProperty(value = "活动id") + private Long activityId; + + /** + * 查询类型 2-指定商品可用 3-指定商品不可用 + */ + @ApiModelProperty(value = "查询类型") + private Integer queryType; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java index e0cdec3..bd3be28 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java @@ -97,6 +97,7 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission @Override @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) public void delete(PermissionDeleteParam param, CerePlatformBusiness user) throws CoBusinessException { + ContextUtil.interceptDelete(); String time=TimeUtils.yyMMddHHmmss(); cerePlatformPermissionDAO.deleteByPrimaryKey(param.getPermissionId()); //同步删除角色关联菜单权限数据 diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java index 2434fc6..5e78cc9 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java @@ -5,9 +5,11 @@ */ package com.shop.cereshop.business.service.tool.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.shop.cereshop.business.dao.tool.CereShopCouponDAO; +import com.shop.cereshop.business.dao.tool.CereShopCouponExcludeDAO; import com.shop.cereshop.business.page.canvas.ProductCoupon; import com.shop.cereshop.business.page.operate.OperateCoupon; import com.shop.cereshop.business.page.tool.*; @@ -25,6 +27,7 @@ import com.shop.cereshop.commons.domain.business.CerePlatformBusiness; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.tool.CereShopCoupon; import com.shop.cereshop.commons.domain.tool.CereShopCouponDetail; +import com.shop.cereshop.commons.domain.tool.CereShopCouponExclude; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; import com.shop.cereshop.commons.utils.TimeUtils; @@ -59,11 +62,15 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { @Autowired private CereRedisKeyServcice cereRedisKeyServcice; + @Autowired + private CereShopCouponExcludeDAO cereShopCouponExcludeDAO; + @Override @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) public void save(ShopCouponSaveParam param, CerePlatformBusiness user) throws CoBusinessException,Exception { String time = TimeUtils.yyMMddHHmmss(); List ids=null; + List excludeIds = null; if(IntegerEnum.APPLY_TYPE_ALL.getCode().equals(param.getApplyType())){ //如果是全部商品,查询本店所有有效商品id ids=cereShopCouponDAO.findProductIdsByShopId(param.getShopId()); @@ -73,6 +80,7 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { }else { //如果是指定商品不可用,查询本店所有不在这个范围内的有效商品id ids=cereShopCouponDAO.findProductIdsByShopIdAndIds(param.getShopId(),param.getIds()); + excludeIds = param.getIds(); } if (param.getType() == 2) { if (IntegerEnum.TIME_TYPE_FIXED.getCode().equals(param.getTimeType())) { @@ -158,6 +166,15 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { }).collect(Collectors.toList()); cereShopCouponDetailService.insertBatch(collect); } + if (!EmptyUtils.isEmpty(excludeIds)) { + List excludeList = excludeIds.stream().map(id -> { + CereShopCouponExclude exclude = new CereShopCouponExclude(); + exclude.setProductId(id); + exclude.setShopCouponId(cereShopCoupon.getShopCouponId()); + return exclude; + }).collect(Collectors.toList()); + cereShopCouponExcludeDAO.insertBatch(excludeList); + } //新增日志 cerePlatformLogService.addLog(user,"优惠券管理","商家端操作","新增优惠券",cereShopCoupon.getShopCouponId(),time); } @@ -189,6 +206,7 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { public void update(ShopCouponUpdateParam param, CerePlatformBusiness user) throws CoBusinessException, Exception { String time = TimeUtils.yyMMddHHmmss(); List ids=new ArrayList<>(); + List excludeIds = null; if(IntegerEnum.APPLY_TYPE_ALL.getCode().equals(param.getApplyType())){ //如果是全部商品,查询本店所有有效商品id ids=cereShopCouponDAO.findProductIdsByShopId(param.getShopId()); @@ -198,6 +216,7 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { }else { //如果是指定商品不可用,查询本店所有不在这个范围内的有效商品id ids=cereShopCouponDAO.findProductIdsByShopIdAndIds(param.getShopId(),param.getIds()); + excludeIds = param.getIds(); } if (param.getType() == 2) { if (IntegerEnum.TIME_TYPE_FIXED.getCode().equals(param.getTimeType())) { @@ -282,6 +301,8 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { } //清空商品明细数据 cereShopCouponDetailService.deleteById(cereShopCoupon.getShopCouponId()); + cereShopCouponExcludeDAO.delete(Wrappers.lambdaQuery() + .eq(CereShopCouponExclude::getShopCouponId, cereShopCoupon.getShopCouponId())); //新增商品明细数据 if(!EmptyUtils.isEmpty(ids)){ List collect = ids.stream().map(id -> { @@ -292,6 +313,15 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { }).collect(Collectors.toList()); cereShopCouponDetailService.insertBatch(collect); } + if (!EmptyUtils.isEmpty(excludeIds)) { + List excludeList = excludeIds.stream().map(id -> { + CereShopCouponExclude exclude = new CereShopCouponExclude(); + exclude.setProductId(id); + exclude.setShopCouponId(cereShopCoupon.getShopCouponId()); + return exclude; + }).collect(Collectors.toList()); + cereShopCouponExcludeDAO.insertBatch(excludeList); + } //新增日志 cerePlatformLogService.addLog(user,"优惠券管理","商家端操作","修改优惠券",cereShopCoupon.getShopCouponId(),time); } @@ -302,6 +332,11 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { if(detail!=null){ //查询商品明细数据 detail.setProducts(cereShopCouponDetailService.findProducts(shopCouponId)); + if (IntegerEnum.APPLY_TYPE_NO.getCode().equals(detail.getApplyType())) { + detail.setExcludeIds(cereShopCouponExcludeDAO.selectList(Wrappers.lambdaQuery() + .eq(CereShopCouponExclude::getShopCouponId, shopCouponId)).stream().map(CereShopCouponExclude::getProductId) + .collect(Collectors.toList())); + } } return detail; } @@ -361,7 +396,7 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { @Override public Page getProducts(ToolProductParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); - List list=cereShopCouponDAO.getProducts(param.getShopId()); + List list=cereShopCouponDAO.getProducts(param.getShopId(), param.getActivityId(), param.getQueryType()); PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopDiscountServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopDiscountServiceImpl.java index 5c68e08..54e55a4 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopDiscountServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopDiscountServiceImpl.java @@ -391,7 +391,7 @@ public class CereShopDiscountServiceImpl implements CereShopDiscountService{ @Override public Page getProducts(ToolProductParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); - List list=cereShopDiscountDAO.getProducts(param.getShopId()); + List list=cereShopDiscountDAO.getProducts(param.getShopId(), param.getActivityId()); PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopGroupWorkServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopGroupWorkServiceImpl.java index 9fc3696..2545a79 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopGroupWorkServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopGroupWorkServiceImpl.java @@ -384,7 +384,7 @@ public class CereShopGroupWorkServiceImpl implements CereShopGroupWorkService { @Override public Page getProducts(ToolProductParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); - List list=cereShopGroupWorkDAO.getProducts(param.getShopId()); + List list=cereShopGroupWorkDAO.getProducts(param.getShopId(), param.getActivityId()); PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopSeckillServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopSeckillServiceImpl.java index b484a95..13668cc 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopSeckillServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopSeckillServiceImpl.java @@ -396,7 +396,7 @@ public class CereShopSeckillServiceImpl implements CereShopSeckillService { @Override public Page getProducts(ToolProductParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); - List list=cereShopSeckillDAO.getProducts(param.getShopId()); + List list=cereShopSeckillDAO.getProducts(param.getShopId(), param.getActivityId()); PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; diff --git a/cereshop-business/src/main/resources/mybatis/mapper/log/CerePlatformWebLogDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/log/CerePlatformWebLogDAO.xml new file mode 100644 index 0000000..9e96fe9 --- /dev/null +++ b/cereshop-business/src/main/resources/mybatis/mapper/log/CerePlatformWebLogDAO.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + web_log_id, `name`, url, params, `type`, ip, ip_source, `describe`, browser_name, + `time`, create_time + + + + delete from cere_platform_web_log + where web_log_id = #{webLogId,jdbcType=BIGINT} + + + insert into cere_platform_web_log + + + `name`, + + + url, + + + params, + + + `type`, + + + ip, + + + ip_source, + + + `describe`, + + + browser_name, + + + `time`, + + + create_time, + + + + + #{name,jdbcType=VARCHAR}, + + + #{url,jdbcType=VARCHAR}, + + + #{params,jdbcType=VARCHAR}, + + + #{type,jdbcType=BIT}, + + + #{ip,jdbcType=VARCHAR}, + + + #{ipSource,jdbcType=VARCHAR}, + + + #{describe,jdbcType=VARCHAR}, + + + #{browserName,jdbcType=VARCHAR}, + + + #{time,jdbcType=INTEGER}, + + + #{createTime,jdbcType=VARCHAR}, + + + + + update cere_platform_web_log + + + `name` = #{name,jdbcType=VARCHAR}, + + + url = #{url,jdbcType=VARCHAR}, + + + params = #{params,jdbcType=VARCHAR}, + + + `type` = #{type,jdbcType=BIT}, + + + ip = #{ip,jdbcType=VARCHAR}, + + + ip_source = #{ipSource,jdbcType=VARCHAR}, + + + `describe` = #{describe,jdbcType=VARCHAR}, + + + browser_name = #{browserName,jdbcType=VARCHAR}, + + + `time` = #{time,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=VARCHAR}, + + + where web_log_id = #{webLogId,jdbcType=BIGINT} + + + update cere_platform_web_log + set `name` = #{name,jdbcType=VARCHAR}, + url = #{url,jdbcType=VARCHAR}, + params = #{params,jdbcType=VARCHAR}, + `type` = #{type,jdbcType=BIT}, + ip = #{ip,jdbcType=VARCHAR}, + ip_source = #{ipSource,jdbcType=VARCHAR}, + `describe` = #{describe,jdbcType=VARCHAR}, + browser_name = #{browserName,jdbcType=VARCHAR}, + `time` = #{time,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=VARCHAR} + where web_log_id = #{webLogId,jdbcType=BIGINT} + + diff --git a/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml index a4b6f1d..e5f575c 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml @@ -161,13 +161,25 @@