修改库存

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -211,7 +211,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 
             for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
-                if(item.getStatus() >=6 || item.getStatus()!=7){
+                if(item.getStatus() >=6 && item.getStatus()!=7){
                     if (DateUtil.compareStrDay(item.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
                         item.setStatus(9);
                     } else if (DateUtil.compareStrDay(item.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -382,8 +382,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                             //修改 redis库存
                             if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
                                 KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
-                                int changeGeneral = ticketStatus.getTotalGeneral() - ticketItem.getTotalGeneral();
-                                int changeExchange = ticketStatus.getTotalGeneral() - ticketItem.getTotalExchange();
+                                int changeGeneral = ticketItem.getTotalGeneral() - ticketStatus.getTotalGeneral();
+                                int changeExchange = ticketItem.getTotalExchange() - ticketStatus.getTotalGeneral();
                                 dataUtils.changeSurplusGeneral(ticketItem.getTicketsId(), changeGeneral);
                                 dataUtils.changeSurplusExchange(ticketItem.getTicketsId(), changeExchange);
                             }
@@ -598,12 +598,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
                 for (int i = 0; i < voList.size(); i++) {
                     PerformancePartnerListDao vo = voList.get(i);
-                    if(vo.getStatus() >=6 || vo.getStatus()!=7){
+                    if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
                         if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
                             vo.setStatus(9);
                         } else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
                             vo.setStatus(10);
-                        }else{
+                        } else {
                             vo.setStatus(6);
                         }
                     }