From d781eaa35878f223c1c76181b23419029ef77909 Mon Sep 17 00:00:00 2001 From: axindata <1851789500@qq.com> Date: Mon, 17 Feb 2025 10:13:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E4=B8=93?= =?UTF-8?q?=E5=8C=BA=E5=92=8C=E7=A7=AF=E5=88=86=E4=B8=93=E5=8C=BA=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/controller/PmsProductController.java | 26 +++++++++++++ .../mall/service/PmsProductService.java | 16 ++++++++ .../service/impl/PmsProductServiceImpl.java | 24 ++++++++++++ .../impl/SmsHomeNewProductServiceImpl.java | 3 -- .../mall/mapper/SmsHomeNewProductMapper.java | 5 --- .../com/buy507/mall/model/PmsProduct.java | 39 +++++++++++++++++++ .../buy507/mall/mapper/PmsProductMapper.xml | 6 +++ .../controller/OmsPortalOrderController.java | 13 +++---- .../impl/OmsPortalOrderServiceImpl.java | 14 ------- 9 files changed, 117 insertions(+), 29 deletions(-) diff --git a/mall-admin/src/main/java/com/buy507/mall/controller/PmsProductController.java b/mall-admin/src/main/java/com/buy507/mall/controller/PmsProductController.java index 91572b5..47f7d31 100644 --- a/mall-admin/src/main/java/com/buy507/mall/controller/PmsProductController.java +++ b/mall-admin/src/main/java/com/buy507/mall/controller/PmsProductController.java @@ -138,6 +138,32 @@ public class PmsProductController { } } + @ApiOperation("批量设为积分专区") + @RequestMapping(value = "/update/integrationStatus", method = RequestMethod.POST) + @ResponseBody + public CommonResult updateIntegrationStatus(@RequestParam("ids") List ids, + @RequestParam("pointsAreaStatus") Integer pointsAreaStatus) { + int count = productService.updatepointsAreaStatus(ids, pointsAreaStatus); + if (count > 0) { + return CommonResult.success(count); + } else { + return CommonResult.failed(); + } + } + + @ApiOperation("批量设为积分兑换专区") + @RequestMapping(value = "/update/integrationExchangeStatus", method = RequestMethod.POST) + @ResponseBody + public CommonResult updateIntegrationExchangeStatus(@RequestParam("ids") List ids, + @RequestParam("pointsExchangeStatus") Integer pointsExchangeStatus) { + int count = productService.updatepointsExchangeStatus(ids, pointsExchangeStatus); + if (count > 0) { + return CommonResult.success(count); + } else { + return CommonResult.failed(); + } + } + @ApiOperation("批量修改删除状态") @RequestMapping(value = "/update/deleteStatus", method = RequestMethod.POST) @ResponseBody diff --git a/mall-admin/src/main/java/com/buy507/mall/service/PmsProductService.java b/mall-admin/src/main/java/com/buy507/mall/service/PmsProductService.java index a3d4bbd..0deaeec 100644 --- a/mall-admin/src/main/java/com/buy507/mall/service/PmsProductService.java +++ b/mall-admin/src/main/java/com/buy507/mall/service/PmsProductService.java @@ -60,6 +60,17 @@ public interface PmsProductService { */ int updateNewStatus(List ids, Integer newStatus); + /** + *批量设为积分专区 + */ + int updatepointsAreaStatus(List ids, Integer pointsAreaStatus); + + /** + * 批量设为积分兑换专区 + */ + int updatepointsExchangeStatus(List ids, Integer pointsExchangeStatus); + + /** * 批量删除商品 */ @@ -69,4 +80,9 @@ public interface PmsProductService { * 根据商品名称或者货号模糊查询 */ List list(String keyword); + + + + + } diff --git a/mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java b/mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java index 8323cd0..1908424 100644 --- a/mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java +++ b/mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java @@ -264,6 +264,27 @@ public class PmsProductServiceImpl implements PmsProductService { return productMapper.updateByExampleSelective(record, example); } + //积分区域 + @Override + public int updatepointsAreaStatus(List ids, Integer pointsAreaStatus) { + PmsProduct record = new PmsProduct(); + record.setPointsAreaStatus(pointsAreaStatus); + PmsProductExample example = new PmsProductExample(); + example.createCriteria().andIdIn(ids); + return productMapper.updateByExampleSelective(record, example); + } + + //积分兑换区域 + @Override + public int updatepointsExchangeStatus(List ids, Integer pointsExchangeStatus) { + PmsProduct record = new PmsProduct(); + record.setPointsExchangeStatus(pointsExchangeStatus); + PmsProductExample example = new PmsProductExample(); + example.createCriteria().andIdIn(ids); + return productMapper.updateByExampleSelective(record, example); + } + + @Override public int updateDeleteStatus(List ids, Integer deleteStatus) { PmsProduct record = new PmsProduct(); @@ -273,6 +294,7 @@ public class PmsProductServiceImpl implements PmsProductService { return productMapper.updateByExampleSelective(record, example); } + @Override public List list(String keyword) { PmsProductExample productExample = new PmsProductExample(); @@ -285,6 +307,8 @@ public class PmsProductServiceImpl implements PmsProductService { return productMapper.selectByExample(productExample); } + + /** * @deprecated 旧版创建 */ diff --git a/mall-admin/src/main/java/com/buy507/mall/service/impl/SmsHomeNewProductServiceImpl.java b/mall-admin/src/main/java/com/buy507/mall/service/impl/SmsHomeNewProductServiceImpl.java index fc1415c..3446ff8 100644 --- a/mall-admin/src/main/java/com/buy507/mall/service/impl/SmsHomeNewProductServiceImpl.java +++ b/mall-admin/src/main/java/com/buy507/mall/service/impl/SmsHomeNewProductServiceImpl.java @@ -23,9 +23,6 @@ public class SmsHomeNewProductServiceImpl implements SmsHomeNewProductService { for (SmsHomeNewProduct SmsHomeNewProduct : homeNewProductList) { SmsHomeNewProduct.setRecommendStatus(1); SmsHomeNewProduct.setSort(0); - SmsHomeNewProduct.setVipStatus(1); - SmsHomeNewProduct.setPointsAreaStatus(1); - SmsHomeNewProduct.setPointsExchangeStatus(1); homeNewProductMapper.insert(SmsHomeNewProduct); } return homeNewProductList.size(); diff --git a/mall-dao/src/main/java/com/buy507/mall/mapper/SmsHomeNewProductMapper.java b/mall-dao/src/main/java/com/buy507/mall/mapper/SmsHomeNewProductMapper.java index b988e14..4389869 100644 --- a/mall-dao/src/main/java/com/buy507/mall/mapper/SmsHomeNewProductMapper.java +++ b/mall-dao/src/main/java/com/buy507/mall/mapper/SmsHomeNewProductMapper.java @@ -29,9 +29,4 @@ public interface SmsHomeNewProductMapper { int updateByPrimaryKey(SmsHomeNewProduct record); - /** - * 通过 productId 查询 SmsHomeNewProduct - */ - @Select("SELECT * FROM pms_product WHERE product_id = #{productId} LIMIT 1") - SmsHomeNewProduct selectByProductId(@Param("productId") Long productId); } \ No newline at end of file diff --git a/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java b/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java index fc98ac0..b00e3e1 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java @@ -174,6 +174,15 @@ public class PmsProduct implements Serializable { @Transient @ApiModelProperty(value = "好评比例") private PmsComment commentBiLi; + + // 会员专区状态 + private Integer vipStatus; + + // 积分专区状态 + private Integer pointsAreaStatus; + + // 积分兑换专区状态 + private Integer pointsExchangeStatus; @@ -618,6 +627,33 @@ public class PmsProduct implements Serializable { this.distributionFlag = distributionFlag; } + public Integer getVipStatus() { + return vipStatus; + } + + public void setVipStatus(Integer vipStatus) { + this.vipStatus = vipStatus; + } + + + public Integer getPointsAreaStatus() { + return pointsAreaStatus; + } + + public void setPointsAreaStatus(Integer pointsAreaStatus) { + this.pointsAreaStatus = pointsAreaStatus; + } + + + public Integer getPointsExchangeStatus() { + return pointsExchangeStatus; + } + + + public void setPointsExchangeStatus(Integer pointsExchangeStatus) { + this.pointsExchangeStatus = pointsExchangeStatus; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -670,4 +706,7 @@ public class PmsProduct implements Serializable { sb.append("]"); return sb.toString(); } + + + } \ No newline at end of file diff --git a/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml b/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml index ae8987f..5d3559e 100644 --- a/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml +++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml @@ -493,6 +493,12 @@ publish_status = #{record.publishStatus,jdbcType=INTEGER}, + + points_area_status = #{record.pointsAreaStatus,jdbcType=INTEGER}, + + + points_exchange_status = #{record.pointsExchangeStatus,jdbcType=INTEGER}, + new_status = #{record.newStatus,jdbcType=INTEGER}, diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/controller/OmsPortalOrderController.java b/mall-portal/src/main/java/com/buy507/mall/portal/controller/OmsPortalOrderController.java index 5942792..ee43ce2 100644 --- a/mall-portal/src/main/java/com/buy507/mall/portal/controller/OmsPortalOrderController.java +++ b/mall-portal/src/main/java/com/buy507/mall/portal/controller/OmsPortalOrderController.java @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alipay.api.AlipayApiException; +import com.buy507.mall.model.PmsProduct; import com.buy507.mall.model.SmsHomeNewProduct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -200,9 +201,7 @@ public class OmsPortalOrderController { response.sendRedirect("http://49.233.215.129/#/pages/order/order?state=6"); return "支付宝回调"; } - - - + @ApiOperation("加速订单") @RequestMapping(value = "/accelerateOrder",method = RequestMethod.POST) @@ -217,9 +216,9 @@ public class OmsPortalOrderController { @RequestMapping("/orderQueue/info") public CommonResult orderQueueInfo() { - SmsHomeNewProduct smsHomeNewProduct = new SmsHomeNewProduct(); + PmsProduct pmsProduct = new PmsProduct(); //如果是积分专区的商品和积分兑换的商品则不进行排队 - if(smsHomeNewProduct.getPointsAreaStatus() == 1 || smsHomeNewProduct.getPointsExchangeStatus() == 1){ + if(pmsProduct.getPointsAreaStatus() == 1 || pmsProduct.getPointsExchangeStatus() == 1){ return CommonResult.success("该商品不参与排队流程"); } //否则进行排队 @@ -232,9 +231,9 @@ public class OmsPortalOrderController { @ApiOperation(" 加速单排队信息") @RequestMapping("/accelerateOrder/info") public CommonResult accelerateOrderInfo(@RequestParam Long orderId) { - SmsHomeNewProduct smsHomeNewProduct = new SmsHomeNewProduct(); + PmsProduct pmsProduct = new PmsProduct(); //如果是积分专区的商品和积分兑换的商品则不进行排队 - if(smsHomeNewProduct.getPointsAreaStatus() == 1 || smsHomeNewProduct.getPointsExchangeStatus() == 1){ + if(pmsProduct.getPointsAreaStatus() == 1 || pmsProduct.getPointsExchangeStatus() == 1){ return CommonResult.success("该商品不参与排队流程"); } return portalOrderService.accelerateOrderInfo(orderId); diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java index edce2ac..14f2c91 100644 --- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java +++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java @@ -739,20 +739,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { return CommonResult.validateFailed("库存不足，无法下单"); } - //通过productId查询专区信息 - SmsHomeNewProduct homeNewProduct = homeNewProductMapper.selectByProductId(skuStock.getProductId()); - if (homeNewProduct == null) { - return CommonResult.validateFailed("未查询到商品所属专区"); - } - - - // 积分兑换专区逻辑 - if (homeNewProduct.getPointsExchangeStatus() != null && homeNewProduct.getPointsExchangeStatus() == 1) { - log.info("当前商品属于【积分兑换专区】"); - } - - - //根据商品id查询商品信息 PmsProduct product = productMapper.selectByPrimaryKey(skuStock.getProductId()); Map result = new HashMap<>();