正在下单活动

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java

@@ -120,7 +120,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
     @Override
     public ResponseDto<String> zhengzaiInsert(String purchaseName, String performanceId, String img, String st, String et) {
 
-        int count = goblinSelfMarketingMapper.selectCount(Wrappers.lambdaUpdate(GoblinSelfMarketing.class).eq(GoblinSelfMarketing::getPerformanceId,performanceId));
+        int count = goblinSelfMarketingMapper.selectCount(Wrappers.lambdaUpdate(GoblinSelfMarketing.class).eq(GoblinSelfMarketing::getPerformanceId,performanceId).eq(GoblinSelfMarketing::getDelFlag,0));
         if(count>0){
             return ResponseDto.failure("改演出已关联活动");
         }
@@ -152,7 +152,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
 
     @Override
     public ResponseDto<Boolean> zhengzaiUpdate(String marketId, String purchaseName, String performanceId, String img, String st, String et) {
-        int count = goblinSelfMarketingMapper.selectCount(Wrappers.lambdaUpdate(GoblinSelfMarketing.class).eq(GoblinSelfMarketing::getPerformanceId,performanceId));
+        int count = goblinSelfMarketingMapper.selectCount(Wrappers.lambdaUpdate(GoblinSelfMarketing.class).eq(GoblinSelfMarketing::getPerformanceId,performanceId).eq(GoblinSelfMarketing::getDelFlag,0));
         if(count>1){
             return ResponseDto.failure("该演出已关联活动");
         }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml

@@ -50,7 +50,7 @@ from goblin_self_marketing as a
          inner join goblin_marketing_zhengzai_relation as b on a.self_market_id = b.self_market_id
          inner join goblin_store_info as c on c.store_id = b.store_id
          left join goblin_marketing_zhengzai as d on d.store_id = b.store_id  and d.self_market_id = b.self_market_id
-where a.self_market_id = #{marketId}
+where a.self_market_id = #{marketId} and b.del_tag = 0
 GROUP BY b.store_id
     </select>
 
@@ -72,7 +72,7 @@ GROUP BY b.store_id
         from goblin_self_marketing as gsm left join goblin_marketing_zhengzai_relation gmzr on gsm.self_market_id =
         gmzr.self_market_id
         <where>
-            del_flag = 0
+            gmzr.del_tag = 0 and gsm.del_flag = 0
             <if test="purchaseName != null and purchaseName!=''">and gsm.name like concat('%', #{purchaseName}, '%')
                 '%'
             </if>