记得上下班打卡 | git大法好,push需谨慎

Commit c40678d1 authored by 胡佳晨's avatar 胡佳晨

修改 redis

parent 564ffa76
package com.liquidnet.service.kylin.constant;
public class KylinRedisConst {
public static final String FIELDS = "kylin:fields:id";
public static final String PERFORMANCES = "kylin:performances:info";
public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:";
public static final String FIELDS = "kylin:fields:id:";
public static final String PERFORMANCES = "kylin:performances:id:";
public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend:id:";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:id:";
public static final String SURPLUS_GENERAL = "surplusGeneral";
public static final String SURPLUS_EXCHANGE = "surplusExchange";
public static final String TICKET = "kylin:ticket:info";
public static final String ORDER = "kylin:order:info";
public static final String ORDER_ENTITIES = "kylin:order_entities:info";
public static final String TIMES = "kylin:times:id";
public static final String BANNERS = "kylin:banners";
public static final String TICKET = "kylin:ticket:id:";
public static final String ORDER = "kylin:order:id:";
public static final String ORDER_ENTITIES = "kylin:order_entities:id:";
public static final String TIMES = "kylin:times:id:";
public static final String BANNERS = "kylin:banners:id:";
public static final String AGENT = "kylin:agent:info";
public static final String CHECK_USER = "kylin:checkUser";
public static final String CHECK_USER_RELATION = "kylin:checkUser:relation";
public static final String CHECK_USER = "kylin:checkUser:id:";
public static final String CHECK_USER_RELATION = "kylin:checkUser:relation:id:";
}
......@@ -13,4 +13,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IExpressesService extends IService<Expresses> {
// void courierList();
// void observer();
// void observerResult();
// void addExpress();
// void editExpress();
// void getExpressCompany();
// void getExpressCompanyEn();
// void innerAddExpress();
// void expressObserveUnSuccess();
// void expressBatchImport();
// void expressImport();
// void expressEdit();
// void expressEditLog();
}
......@@ -92,7 +92,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
return ResponseDto.failure("参数错误");//参数错误List<AdamEntersVo> entersVoList
}
//判断代理
if(!checkAgent(payOrderParam.getAgentId(),ticketData)){
if (!checkAgent(payOrderParam.getAgentId(), ticketData)) {
lock.unlock();
return ResponseDto.failure("无权购买");
}
......@@ -543,7 +543,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
Query.query(Criteria.where("orderTicketsId").is(payAgainParam.getOrderId())).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
);
redisUtil.hdel(KylinRedisConst.ORDER, orderTickets.getOrderTicketsId());
dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
// SqlMapping.get("kylin_order_ticket.payAgain", orderTickets.getPayAgainObject()));
......@@ -634,7 +634,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketVo))
);
redisUtil.hdel(KylinRedisConst.ORDER, orderTickets.getOrderTicketsId());
dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
HashMap<String, Object> orderTicketEntitiesVo = new HashMap<>();
orderTicketEntitiesVo.put("isPayment", 1);
......@@ -645,7 +645,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
);
List<KylinOrderTicketEntitiesVo> delList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
for (KylinOrderTicketEntitiesVo item : delList) {
redisUtil.hdel(KylinRedisConst.ORDER_ENTITIES, item.getOrderTicketEntitiesId());
dataUtils.delOrderTicketEntitiesRedis(item.getOrderTicketEntitiesId());
}
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
......@@ -721,7 +721,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
);
redisUtil.hdel(KylinRedisConst.ORDER, orderTickets.getOrderTicketsId());
dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
dataUtils.changeSurplusGeneral(itemData.getTicketId(), itemData.getNumber());
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
......
......@@ -19,9 +19,11 @@ import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -61,7 +63,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
private PerformanceVoTask performanceVoTask;
@Autowired
private RedisUtil redisUtil;
private DataUtils dataUtils;
@Autowired
private KylinPerformancesMapper performancesMapper;
......@@ -164,7 +166,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
performanceVoTask.performanceVoStatus(performancesId);
}
}
redisUtil.hdel(KylinRedisConst.PERFORMANCES, performancesId);
dataUtils.delPerformanceRedis(performancesId);
} else if (status == 4) {
log.info(" PERFORMANCE 演出审核 拒绝");
auditStatus = 2;
......@@ -247,7 +249,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
object
);
redisUtil.hdel(KylinRedisConst.PERFORMANCES, performancesId);
dataUtils.delPerformanceRedis(performancesId);
return true;
} catch (Exception e) {
return false;
......@@ -282,7 +284,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
object2
);
}
redisUtil.del(KylinRedisConst.PERFORMANCES_RECOMMEND);
// dataUtils.delPerformanceRecommendRedis(item.getPerformanceId());
return true;
} catch (Exception e) {
return false;
......@@ -481,7 +483,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
object);
performanceVoTask.performanceVoStatus(performanceId);
redisUtil.hdel(KylinRedisConst.PERFORMANCES, performanceId);
dataUtils.delPerformanceRedis(performanceId);
} else {
HashMap<String, Object> map2 = new HashMap<>();
map2.put("status", 2);
......@@ -548,7 +550,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
Query.query(Criteria.where("ticketsId").is(ticketId)).getQueryObject(),
object);
redisUtil.hdel(KylinRedisConst.TICKET, ticketId);
dataUtils.delTicketRedis(ticketId);
return true;
} catch (Exception e) {
return false;
......@@ -564,12 +566,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
return false;
}
//修改 mysql
if(item.getType().equals("ticket")) {
if (item.getType().equals("ticket")) {
KylinTicketStatus ticketStatus = new KylinTicketStatus();
ticketStatus.setUpdatedAt(updatedAt);
ticketStatus.setSyncDamai(item.getStatus());
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId()));
}else if(item.getType().equals("performance")){
} else if (item.getType().equals("performance")) {
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setUpdatedAt(updatedAt);
performanceStatus.setSyncDamai(item.getStatus());
......
......@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUser;
import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.mongodb.BasicDBObject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -45,7 +46,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Autowired
private MongoConverter mongoConverter;
@Autowired
private RedisUtil redisUtil;
private DataUtils dataUtils;
@Autowired
private KylinCheckUserMapper checkUserMapper;
......@@ -69,7 +70,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
checkUser.setUpdatedAt(LocalDateTime.now());
checkUser.setStatus(0);
checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId));
redisUtil.hdel(KylinRedisConst.CHECK_USER, checkUserId);
dataUtils.delCheckUserRedis(checkUserId);
HashMap<String, Object> map = new HashMap<>();
map.put("status", 0);
......@@ -123,7 +124,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
obj
);
redisUtil.hdel(KylinRedisConst.CHECK_USER, checkUserId);
dataUtils.delCheckUserRedis(checkUserId);
return ResponseDto.success("修改成功");
} catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20103));
......
......@@ -16,6 +16,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPerformancesPartnerService;
import com.liquidnet.service.kylin.utils.DataUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
......@@ -44,16 +45,16 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
@Autowired
private MongoConverter mongoConverter;
@Autowired
private RedisUtil redisUtil;
private DataUtils dataUtils;
@Autowired
private KylinCheckUserPerformancesMapper checkUserPerformancesMapper;
@Override
public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(String merchantId, String checkUserId, int page, int size,String name) {
public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(String merchantId, String checkUserId, int page, int size, String name) {
PageInfo<ChildPerformanceDao> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.childPerformanceList(merchantId, checkUserId,name);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.childPerformanceList(merchantId, checkUserId, name);
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......@@ -62,11 +63,11 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
}
@Override
public ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(String merchantId, String checkUserId, int page, int size,String name) {
public ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(String merchantId, String checkUserId, int page, int size, String name) {
PageInfo<ChildPerformanceDao> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.unChildPerformanceList(merchantId, checkUserId,name);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.unChildPerformanceList(merchantId, checkUserId, name);
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......@@ -95,7 +96,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(param.getCheckUserId())), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
redisUtil.hdel(KylinRedisConst.CHECK_USER_RELATION, param.getCheckUserId());
dataUtils.delCheckUserRelationRedis(param.getCheckUserId());
return ResponseDto.success("添加成功");
} catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20101));
......@@ -122,7 +123,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
userPerformanceVo.setCheckUserId(checkUserId);
userPerformanceVo.setRelationParams(performanceRelationParamsList);
mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
redisUtil.hdel(KylinRedisConst.CHECK_USER_RELATION, checkUserId);
dataUtils.delCheckUserRelationRedis(checkUserId);
return ResponseDto.success("删除成功");
} catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20102));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment