Merge pull request '首页代码完善实现' (#8) from main-cx into main

Reviewed-on: #8

mall-admin/src/main/java/com/buy507/mall/controller/PmsProductController.java

@@ -138,32 +138,6 @@ public class PmsProductController {
         }
     }
 
-    @ApiOperation("批量设为积分专区")
-    @RequestMapping(value = "/update/integrationStatus", method = RequestMethod.POST)
-    @ResponseBody
-    public CommonResult updateIntegrationStatus(@RequestParam("ids") List<Long> 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<Long> 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

mall-admin/src/main/java/com/buy507/mall/service/PmsProductService.java

@@ -60,17 +60,6 @@ public interface PmsProductService {
      */
     int updateNewStatus(List<Long> ids, Integer newStatus);
 
-    /**
-     *批量设为积分专区
-     */
-    int updatepointsAreaStatus(List<Long> ids, Integer pointsAreaStatus);
-
-    /**
-     * 批量设为积分兑换专区
-     */
-    int updatepointsExchangeStatus(List<Long> ids, Integer pointsExchangeStatus);
-
-
     /**
      * 批量删除商品
      */

mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java

@@ -264,26 +264,6 @@ public class PmsProductServiceImpl implements PmsProductService {
         return productMapper.updateByExampleSelective(record, example);
     }
 
-    //积分区域
-    @Override
-    public int updatepointsAreaStatus(List<Long> 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<Long> 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<Long> ids, Integer deleteStatus) {

mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java

@@ -157,8 +157,7 @@ public class PmsProduct implements Serializable {
     
     @Transient
     private SmsCoupon smsCoupon;
-    
+
-    
     @ApiModelProperty(value = "评论信息")
     @Transient
     private List<PmsComment> pmsComment;
@@ -175,17 +174,18 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "好评比例")
     private  PmsComment commentBiLi;
 
-    // 会员专区状态
+    @Transient
+    @ApiModelProperty(value = "会员专区状态")
     private Integer vipStatus;
 
-    // 积分专区状态
+    @Transient
+    @ApiModelProperty(value = "积分专区状态")
     private Integer pointsAreaStatus;
 
-    // 积分兑换专区状态
+    @Transient
+    @ApiModelProperty(value = "积分兑换专区状态")
     private Integer pointsExchangeStatus;
     
-    
-
 
 	public List<PmsProductAttribute> getProductAttribute() {
 		return productAttribute;

mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml

@@ -234,6 +234,15 @@
       <if test="newStatus != null">
         new_status,
       </if>
+      <if test="vipStatus != null">
+        vip_status,
+      </if>
+      <if test="pointsAreaStatus != null">
+        points_area_status,
+      </if>
+      <if test="pointsExchangeStatus != null">
+        points_exchange_status,
+      </if>
       <if test="recommandStatus != null">
         recommand_status,
       </if>