活动管理

platform-admin/src/main/java/com/platform/controller/ActivityController.java

@@ -2,6 +2,7 @@ package com.platform.controller;
 
 import com.platform.entity.ActivityEntity;
 import com.platform.service.ActivityService;
+import com.platform.service.TbCfStationItemService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
 import com.platform.utils.R;
@@ -29,6 +30,8 @@ public class ActivityController {
     @Autowired
     private ActivityService activityService;
 
+
+
     /**
      * 查看列表
      */

platform-admin/src/main/java/com/platform/dao/TbCfStationItemDao.java

@@ -16,6 +16,9 @@ import java.util.Map;
  */
 public interface TbCfStationItemDao extends BaseDao<TbCfStationItemEntity> {
 
+
+    List<TbCfStationItemEntity> queryItemByIds(String[] itemIds);
+
     int changeItemStatus(@Param("status") Integer status, @Param("itemIds") String[] itemIds);
 
     List<ItemDescSkus> queryItemInfoById(String itemId);

platform-admin/src/main/java/com/platform/entity/ActivityEntity.java

@@ -3,6 +3,7 @@ package com.platform.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 实体
@@ -75,6 +76,8 @@ public class ActivityEntity implements Serializable {
      */
     private Date updateTime;
 
+    private List<TbCfStationItemEntity> itemList;
+
     /**
      * 设置：活动ID
      */
@@ -284,4 +287,20 @@ public class ActivityEntity implements Serializable {
     public Date getUpdateTime() {
         return updateTime;
     }
+
+    public List<TbCfStationItemEntity> getItemList() {
+        return itemList;
+    }
+
+    public void setItemList(List<TbCfStationItemEntity> itemList) {
+        this.itemList = itemList;
+    }
+
+    public Double getDiscountRate() {
+        return discountRate;
+    }
+
+    public void setDiscountRate(Double discountRate) {
+        this.discountRate = discountRate;
+    }
 }

platform-admin/src/main/java/com/platform/service/impl/ActivityServiceImpl.java

 package com.platform.service.impl;
 
 import com.platform.dao.ActivityDao;
+import com.platform.dao.TbCfStationItemDao;
 import com.platform.entity.ActivityEntity;
+import com.platform.entity.TbCfStationItemEntity;
 import com.platform.service.ActivityService;
 import com.platform.utils.IdUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -21,9 +24,20 @@ public class ActivityServiceImpl implements ActivityService {
     @Autowired
     private ActivityDao activityDao;
 
+    @Autowired
+    private TbCfStationItemDao itemDao;
+
     @Override
     public ActivityEntity queryObject(String id) {
-        return activityDao.queryObject(id);
+        ActivityEntity activity = activityDao.queryObject(id);
+
+        //指定商品 && 查出所有的活动商品
+        if ("3".equals(activity.getUseType())) {
+            String[] idArr = activity.getItemIds().split(";");
+            List<TbCfStationItemEntity> itemList = itemDao.queryItemByIds(idArr);
+            activity.setItemList(itemList);
+        }
+        return activity;
     }
 
     @Override
@@ -39,11 +53,14 @@ public class ActivityServiceImpl implements ActivityService {
     @Override
     public int save(ActivityEntity activity) {
         activity.setId(IdUtil.createIdbyUUID());
+        activity.setCreateTime(new Date());
+        activity.setUpdateTime(new Date());
         return activityDao.save(activity);
     }
 
     @Override
     public int update(ActivityEntity activity) {
+        activity.setUpdateTime(new Date());
         return activityDao.update(activity);
     }
 

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -61,6 +61,35 @@
 		where i.item_id = #{id}
 	</select>
 
+    <select id="queryItemByIds" resultType="com.platform.entity.TbCfStationItemEntityExtends">
+        select
+		i.item_id,
+        i.item_code,
+        i.item_name,
+        i.item_brief,
+        i.item_tags,
+        i.item_label,
+        i.item_category,
+        i.item_price,
+        i.discount_price,
+        i.cost_price,
+        i.item_img,
+        i.item_url,
+        i.enable_flag,
+        i.create_time,
+        i.item_categorytwo,
+        i.item_descrition_id,
+        i.item_top,
+        i.sort,
+        i.supplier,
+        template
+		from tb_cf_station_item i
+		where i.item_id in
+        <foreach item="itemId" collection="array" open="(" separator="," close=")">
+            #{itemId}
+        </foreach>
+	</select>
+
     <select id="getAdvertisementItem" resultType="com.platform.entity.TbCfStationItemEntityExtends">
         select
         i.`item_id`,

platform-admin/src/main/resources/dev/platform.properties

@@ -6,7 +6,7 @@
 #jdbc.username=root
 #jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica_ref?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: Diaoyunnuli.8