增加删除操作

src/main/java/com/caimei/modules/hehe/dao/CmHeheActivityDao.java

@@ -21,4 +21,10 @@ public interface CmHeheActivityDao extends CrudDao<CmHeheActivity> {
      * @param id
      */
     void updateStatusById(@Param("status") String status, @Param("id") Integer id);
+
+    void deleteActivityProduct(String activityId);
+
+    void deleteUserActivity(String activityId);
+
+    void deleteActivityLadder(String activityId);
 }

src/main/java/com/caimei/modules/hehe/dao/CmHeheActivityProductDao.java

@@ -63,4 +63,11 @@ public interface CmHeheActivityProductDao extends CrudDao<CmHeheActivityProduct>
      * @return
      */
     Integer findActivityByProductId(String productId);
+
+    /**
+     * 删除分销者活动商品
+     *
+     * @param productId
+     */
+    void deleteUserActivity(Integer productId);
 }

src/main/java/com/caimei/modules/hehe/dao/CmHeheProductDao.java

@@ -39,4 +39,11 @@ public interface CmHeheProductDao extends CrudDao<CmHeheProduct> {
      * @param id
      */
     void saveSort(@Param("sort") String sort, @Param("id") String id);
+
+    /**
+     * 删除活动商品
+     *
+     * @param productId
+     */
+    void deleteActivityProduct(Integer productId);
 }

src/main/java/com/caimei/modules/hehe/service/CmHeheActivityProductService.java

@@ -56,6 +56,8 @@ public class CmHeheActivityProductService extends CrudService<CmHeheActivityProd
     @Transactional(readOnly = false)
     public void delete(CmHeheActivityProduct cmHeheActivityProduct) {
         super.delete(cmHeheActivityProduct);
+        activityProductDao.deleteUserActivity(cmHeheActivityProduct.getProductId());
+        activityProductDao.deleteLadder(null, cmHeheActivityProduct.getProductId());
     }
 
     public Page<CmHeheProduct> findProductPage(Page<CmHeheProduct> productPage, CmHeheProduct product) {

src/main/java/com/caimei/modules/hehe/service/CmHeheActivityService.java

@@ -91,6 +91,12 @@ public class CmHeheActivityService extends CrudService<CmHeheActivityDao, CmHehe
     @Transactional(readOnly = false)
     public void delete(CmHeheActivity cmHeheActivity) {
         super.delete(cmHeheActivity);
+        //删除活动下商品
+        cmHeheActivityDao.deleteActivityProduct(cmHeheActivity.getId());
+        //删除分销者活动商品
+        cmHeheActivityDao.deleteUserActivity(cmHeheActivity.getId());
+        //删除活动商品阶梯
+        cmHeheActivityDao.deleteActivityLadder(cmHeheActivity.getId());
     }
 
     @Transactional(readOnly = false)

src/main/java/com/caimei/modules/hehe/service/CmHeheProductService.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.hehe.service;
 
+import com.caimei.modules.hehe.dao.CmHeheActivityProductDao;
 import com.caimei.modules.hehe.dao.CmHeheProductDao;
 import com.caimei.modules.hehe.entity.CmHeheProduct;
 import com.caimei.modules.product.entity.Product;
@@ -27,6 +28,8 @@ import java.util.List;
 public class CmHeheProductService extends CrudService<CmHeheProductDao, CmHeheProduct> {
     @Autowired
     private CmHeheProductDao cmHeheProductDao;
+    @Autowired
+    private CmHeheActivityProductDao activityProductDao;
 
     public CmHeheProduct get(String id) {
         return super.get(id);
@@ -59,6 +62,12 @@ public class CmHeheProductService extends CrudService<CmHeheProductDao, CmHehePr
     @Transactional(readOnly = false)
     public void delete(CmHeheProduct cmHeheProduct) {
         super.delete(cmHeheProduct);
+        //删除活动商品
+        cmHeheProductDao.deleteActivityProduct(cmHeheProduct.getProductId());
+        //删除分销者活动商品
+        activityProductDao.deleteUserActivity(cmHeheProduct.getProductId());
+        //删除活动阶梯
+        activityProductDao.deleteLadder(null,cmHeheProduct.getProductId());
     }
 
     public Page<Product> findProductPage(Page<Product> productPage, Product product) {

src/main/resources/mappings/modules/hehe/CmHeheActivityMapper.xml

@@ -115,4 +115,17 @@
 	<update id="updateStatusById">
 		UPDATE cm_hehe_activity SET status = #{status} WHERE id = #{id}
 	</update>
+
+	<update id="deleteActivityProduct">
+		UPDATE cm_hehe_activity_product SET delFlag = 1 WHERE  activityId = #{activityId}
+	</update>
+
+	<delete id="deleteUserActivity">
+		DELETE FROM cm_hehe_user_activity WHERE activityId = #{activityId}
+	</delete>
+
+	<delete id="deleteActivityLadder">
+		DELETE FROM cm_hehe_activity_ladder WHERE activityId = #{activityId}
+	</delete>
+
 </mapper>

src/main/resources/mappings/modules/hehe/CmHeheActivityProductMapper.xml

@@ -169,11 +169,20 @@
 	</insert>
 
 	<delete id="deleteLadder">
-		DELETE FROM cm_hehe_activity_ladder WHERE activityId = #{activityId} AND productId =#{productId}
+		DELETE FROM cm_hehe_activity_ladder WHERE
+		productId =#{productId}
+		<if test="activityId != null">
+			AND activityId = #{activityId}
+		</if>
 	</delete>
 
 	<select id="findActivityByProductId" resultType="integer">
 		SELECT activityId FROM cm_hehe_activity_product WHERE productId = #{productId}
 	</select>
+
+	<delete id="deleteUserActivity">
+		DELETE FROM cm_hehe_user_activity WHERE productId = #{productId}
+	</delete>
+
 	
 </mapper>

src/main/resources/mappings/modules/hehe/CmHeheProductMapper.xml

@@ -178,4 +178,8 @@
 		UPDATE cm_hehe_product SET sort = #{sort} WHERE id = #{id}
 	</update>
 	
+	<update id="deleteActivityProduct">
+		UPDATE cm_hehe_activity_product SET delFlag = 1 WHERE productId = #{productId}
+	</update>
+	
 </mapper>

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -128,6 +128,7 @@
 		LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
 	    LEFT JOIN product p ON cop.productID = p.productID
         <where>
+			co.orderType != 2
             <if test="orderID != null and orderID != ''">
                 AND co.orderID = #{orderID}
             </if>