优惠券后台代码修改

kmall-admin/src/main/java/com/kmall/admin/dao/OrderDao.java

@@ -20,7 +20,7 @@ public interface OrderDao extends BaseDao<OrderEntity> {
      *
      * @param activityId
      */
-    OrderEntity queryObjectByActivityId(@Param("activityId") Long activityId, @Param("orderType") Integer orderType);
+    List<OrderEntity> queryObjectByActivityId(@Param("activityId") Integer activityId);
 
     OrderEntity queryObjectBySysUser(Long id);
     /**

kmall-admin/src/main/java/com/kmall/admin/dao/UserCouponDao.java

@@ -21,5 +21,8 @@ public interface UserCouponDao extends BaseDao<UserCouponEntity> {
 
     List<UserCouponEntity> getUserCouponByDiscIdList(Map<String, Object> map);
 
+    List<UserCouponEntity> queryByStoreTopicId(@Param("storeTopicId") Integer storeTopicId);
+
+
     int queryUserCouponByDiscIdTotal(Map<String, Object> map);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsGroupOpenServiceImpl.java

@@ -86,7 +86,7 @@ public class GoodsGroupOpenServiceImpl implements GoodsGroupOpenService {
         Map detailMap = Maps.newHashMap();
         detailMap.put("openId", id);
         List<GoodsGroupOpenDetailEntity> openDetailEntityList = goodsGroupOpenDetailDao.queryList(detailMap);
-        if (null != openDetailEntityList && openDetailEntityList.size() > 0) {
+       /* if (null != openDetailEntityList && openDetailEntityList.size() > 0) {
             for (GoodsGroupOpenDetailEntity detailEntity : openDetailEntityList) {
                 // 参团状态 0待付款  1拼团中 2拼团成功 3拼团失败
                 if (detailEntity.getAttendStatus() == 0) {
@@ -131,7 +131,7 @@ public class GoodsGroupOpenServiceImpl implements GoodsGroupOpenService {
                             0.01, 0.01);
                 }
             }
-        }
+        }*/
         result = 1;
         return result;
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/store/MkStoreTicketDiscountServiceImpl.java

@@ -1,13 +1,17 @@
 package com.kmall.admin.service.impl.mk.store;
 
 import com.kmall.admin.dao.AdDao;
+import com.kmall.admin.dao.OrderDao;
 import com.kmall.admin.dao.StoreDao;
+import com.kmall.admin.dao.UserCouponDao;
 import com.kmall.admin.dao.mk.store.MkStoreTicketDiscountDao;
 import com.kmall.admin.dao.mk.store.MkStoreTicketDiscountGoodsDao;
 import com.kmall.admin.dao.mk.store.MkStoreTicketGoodsTempDao;
 import com.kmall.admin.dao.mk.store.StoreTopicDao;
 import com.kmall.admin.entity.AdEntity;
+import com.kmall.admin.entity.OrderEntity;
 import com.kmall.admin.entity.StoreEntity;
+import com.kmall.admin.entity.UserCouponEntity;
 import com.kmall.admin.entity.mk.store.MkStoreTicketDiscountEntity;
 import com.kmall.admin.entity.mk.store.MkStoreTicketDiscountGoodsEntity;
 import com.kmall.admin.entity.mk.store.MkStoreTicketGoodsTempEntity;
@@ -15,6 +19,7 @@ import com.kmall.admin.entity.mk.store.StoreTopicEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.admin.service.mk.store.MkStoreTicketDiscountService;
 import com.kmall.admin.utils.ShiroUtils;
+import com.kmall.api.entity.UserCouponVo;
 import com.kmall.api.service.wxGlobal.ApiWxGlobalPayService;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.RRException;
@@ -48,6 +53,10 @@ public class MkStoreTicketDiscountServiceImpl implements MkStoreTicketDiscountSe
     private StoreDao storeDao;
     @Autowired
     private AdDao adDao;
+    @Autowired
+    private UserCouponDao userCouponDao;
+    @Autowired
+    private OrderDao orderDao;
 
     @Override
     public MkStoreTicketDiscountEntity queryObject(Integer tickDiscId) {
@@ -288,6 +297,7 @@ public class MkStoreTicketDiscountServiceImpl implements MkStoreTicketDiscountSe
         storeTopicEntity.setCreaterSn(user.getUsername());
         storeTopicEntity.setModTime(new Date());
         storeTopicEntity.setModerSn(user.getUsername());
+        storeTopicEntity.setPromTypeId(6);
         storeTopicDao.save(storeTopicEntity);
         return storeTopicEntity;
     }
@@ -299,6 +309,30 @@ public class MkStoreTicketDiscountServiceImpl implements MkStoreTicketDiscountSe
 
     @Override
     public int deleteBatch(Integer[]tickDiscIds) {
+
+        if(tickDiscIds != null && tickDiscIds.length > 0) {
+            Integer[] storeTopicIds = new Integer[tickDiscIds.length];
+            for (int i = 0; i < tickDiscIds.length; i++) {
+                MkStoreTicketDiscountEntity discountEntity = mkStoreTicketDiscountDao.queryObject(tickDiscIds[i]);
+                if (discountEntity != null) {
+                    storeTopicIds[i] = discountEntity.getStoreTopicId();
+                    List<UserCouponEntity> userCouponEntityList = userCouponDao.queryByStoreTopicId(discountEntity.getStoreTopicId());
+                    if (userCouponEntityList != null && userCouponEntityList.size() > 0){
+                        if(userCouponEntityList.size() > 0){
+                            throw new RRException("该优惠券【"+discountEntity.getName()+"】已有"+userCouponEntityList.size()+"个用户领取，不能删除");
+                        }
+                    }
+                    List<OrderEntity> orderEntityList = orderDao.queryObjectByActivityId(discountEntity.getStoreTopicId());
+                    if (orderEntityList != null && orderEntityList.size() > 0){
+                        if(orderEntityList.size() > 0){
+                            throw new RRException("该优惠券【"+discountEntity.getName()+"】已生成"+orderEntityList.size()+"条订单信息，不能删除");
+                        }
+                    }
+                }
+            }
+            storeTopicDao.deleteBatch(storeTopicIds);
+
+        }
         return mkStoreTicketDiscountDao.deleteBatch(tickDiscIds);
     }
 }

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -88,7 +88,7 @@
         select o.*,u.username as username
         from mall_order o
         left join mall_user u on o.user_id = u.id
-        where o.activity_id = #{activityId} and o.order_type = #{orderType}
+        where o.activity_id = #{activityId}
     </select>
 
 

kmall-admin/src/main/resources/mybatis/mapper/UserCouponDao.xml

@@ -30,6 +30,12 @@
         where order_id = #{orderId}
     </select>
 
+    <select id="queryByStoreTopicId" resultType="com.kmall.admin.entity.UserCouponEntity">
+        select *
+        from mall_user_coupon
+        where store_topic_id = #{storeTopicId}
+    </select>
+
     <select id="queryList" resultType="com.kmall.admin.entity.UserCouponEntity">
         select
         mall_user_coupon.*,

kmall-admin/src/main/webapp/js/mk/mkstoreticketdiscount.js

@@ -82,16 +82,14 @@ $(function () {
                             "onclick='vm.updateById(" + row.tickDiscId + ")'><i class='fa fa-qrcode'></i>修改</button>&nbsp;&nbsp;&nbsp;&nbsp;" +
                             "<button class='btn btn-outline btn-primary' " +
                             "onclick='vm.putOn(" + row.tickDiscId + ")'><i class='fa fa-qrcode'></i>投放</button>&nbsp;&nbsp;&nbsp;&nbsp;" +
-                            "<button class='btn btn-outline btn-primary' " +
-                            "onclick='vm.getInfo(" + row.tickDiscId + ")'><i class='fa fa-qrcode'></i>统计</button>&nbsp;&nbsp;&nbsp;&nbsp;"+
+
                             "<button class='btn btn-outline btn-primary' " +
                             "onclick='vm.getUserCoupon(" + row.tickDiscId + ")'><i class='fa fa-qrcode'></i>码库</button>";
                     }
                     if(row.isPast == 1 || row.isValid == 1){
                         htmlStr = "<button class='btn btn-outline btn-primary' " +
                             "onclick='vm.showInfo(" + row.tickDiscId + ")'><i class='fa fa-qrcode'></i>详情</button>&nbsp;&nbsp;&nbsp;&nbsp;"+
-                            "<button class='btn btn-outline btn-primary' " +
-                            "onclick='vm.getInfo(" + row.tickDiscId + ")'><i class='fa fa-qrcode'></i>统计</button>&nbsp;&nbsp;&nbsp;&nbsp;"+
+
                             "<button class='btn btn-outline btn-primary' " +
                             "onclick='vm.getUserCoupon(" + row.tickDiscId + ")'><i class='fa fa-qrcode'></i>码库</button>";
                     }