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

Commit 6dfb820a authored by 胡佳晨's avatar 胡佳晨

commit

parent 6b9d5a53
...@@ -11,7 +11,6 @@ import com.liquidnet.service.kylin.entity.*; ...@@ -11,7 +11,6 @@ import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.other.DamaiService; import com.liquidnet.service.kylin.service.other.DamaiService;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo; import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.taobao.api.TaobaoClient; import com.taobao.api.TaobaoClient;
import com.taobao.api.internal.util.StringUtils; import com.taobao.api.internal.util.StringUtils;
import com.taobao.api.request.*; import com.taobao.api.request.*;
...@@ -64,10 +63,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -64,10 +63,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
private ArrayList<Long> empty = new ArrayList(); private ArrayList<Long> empty = new ArrayList();
int orderCountAll = 0;
@Override @Override
public Boolean sycPerformance(String performanceId) { public Boolean sycPerformance(String performanceId) {
try { try {
empty.clear(); empty.clear();
orderCountAll = 0;
TaobaoClient client = taobaoTicketUtils.initTaobaoClient(); TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
AlibabaDamaiMevOpenPushprojectRequest req = new AlibabaDamaiMevOpenPushprojectRequest(); AlibabaDamaiMevOpenPushprojectRequest req = new AlibabaDamaiMevOpenPushprojectRequest();
ThirdProjectPushOpenParam obj1 = new ThirdProjectPushOpenParam(); ThirdProjectPushOpenParam obj1 = new ThirdProjectPushOpenParam();
...@@ -229,7 +231,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -229,7 +231,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + "-登登登VIP 大麦票种id =" + ticketIdKey + " 票种价格 = " + ticketsData.getPrice()); log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + "-登登登VIP 大麦票种id =" + ticketIdKey + " 票种价格 = " + ticketsData.getPrice());
AlibabaDamaiMevOpenPushitemResponse rsp2 = client2.execute(req2); AlibabaDamaiMevOpenPushitemResponse rsp2 = client2.execute(req2);
if (rsp2.getResult().getSuccess()) { if (rsp2.getResult().getSuccess()) {
return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey,ticketIdKey2); return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey, ticketIdKey2);
} else { } else {
return false; return false;
} }
...@@ -243,7 +245,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -243,7 +245,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
} }
@Override @Override
public Boolean sycOrder(long timemId, String ticketsId, long ticketsmId,long ticketIdMemberKey) { public Boolean sycOrder(long timemId, String ticketsId, long ticketsmId, long ticketIdMemberKey) {
try { try {
TaobaoClient client = taobaoTicketUtils.initTaobaoClient(); TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest(); AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
...@@ -283,6 +285,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -283,6 +285,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
empty.add(orderTicketEntitiesKey); empty.add(orderTicketEntitiesKey);
orderCount+=1; orderCount+=1;
if (empty.contains(orderTicketEntitiesKey)) {
log.info("[ ORDER COPY ] orderId = " + orderTicketEntitiesKey);
orderTicketEntitiesKey = Long.parseLong(orderTicketEntitiesKey + "1");
}
empty.add(orderTicketEntitiesKey);
orderCount += 1;
orderCountAll += 1;
list2.add(obj3); list2.add(obj3);
obj3.setUserName(item.getEnterName());//用户名 入场人姓名 obj3.setUserName(item.getEnterName());//用户名 入场人姓名
obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证 obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
...@@ -290,14 +300,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -290,14 +300,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type
obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间 obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间
obj3.setPerformId(timemId);//场次id obj3.setPerformId(timemId);//场次id
if(item.getIsMember()==1){ if (item.getIsMember() == 1) {
obj3.setExt("登登登VIP"); obj3.setExt("登登登VIP");
obj3.setTicketItemId(ticketIdMemberKey); obj3.setTicketItemId(ticketIdMemberKey);
}else{ } else {
obj3.setExt("登登登VIP"); obj3.setExt("登登登VIP");
obj3.setTicketItemId(ticketsmId); obj3.setTicketItemId(ticketsmId);
} }
obj3.setQrCode("http://m.zhengzai.tv?c="+IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId())); obj3.setQrCode("http://m.zhengzai.tv?c=" + IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId()));
obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
obj3.setOrderId(orderIdKey);//订单id orderId obj3.setOrderId(orderIdKey);//订单id orderId
obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子 obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
...@@ -319,6 +329,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -319,6 +329,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
} }
} }
log.info("[ ORDER COUNT ] orderCount = " + orderCount); log.info("[ ORDER COUNT ] orderCount = " + orderCount);
log.info("[ ORDER COUNT ALL ] orderCount = " + orderCountAll);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -327,7 +338,10 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -327,7 +338,10 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
} }
public static void main(String[] args) { public static void main(String[] args) {
Long a=IDGenerator.getDamaiCode("397341627879178278349754"); Long a=IDGenerator.getDamaiCode("385930697698099233332997");
Long b=IDGenerator.getDamaiCode("385931515691868195803932");
System.out.println(a); System.out.println(a);
System.out.println(b);
} }
} }
...@@ -487,8 +487,8 @@ public class DataImpl { ...@@ -487,8 +487,8 @@ public class DataImpl {
//数据迁移 //数据迁移
while (row.next()) { while (row.next()) {
String mobile = row.getString("mobile"); String mobile = row.getString("mobile");
String merchantId =row.getString("merchant_id"); String merchantId = row.getString("merchant_id");
if(mobile==null){ if (mobile == null) {
continue; continue;
} }
//获取java用户id //获取java用户id
...@@ -505,8 +505,8 @@ public class DataImpl { ...@@ -505,8 +505,8 @@ public class DataImpl {
kylinPerformanceRelationsMapper.update(kylinPerformanceRelations, kylinPerformanceRelationsMapper.update(kylinPerformanceRelations,
Wrappers.lambdaUpdate(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getMerchantId, merchantId)); Wrappers.lambdaUpdate(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getMerchantId, merchantId));
HashMap<String,Object> map = CollectionUtil.mapStringObject(); HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("merchantId",merchantId); map.put("merchantId", merchantId);
//修改vo //修改vo
Query voQuery = Query.query(Criteria.where("merchantId").is(merchantId)); Query voQuery = Query.query(Criteria.where("merchantId").is(merchantId));
BasicDBObject objectVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map)); BasicDBObject objectVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
...@@ -530,60 +530,45 @@ public class DataImpl { ...@@ -530,60 +530,45 @@ public class DataImpl {
} }
//演出主办 //演出主办
// public void sponsor() { public void sponsor() {
// try { try {
// String sql = "select sponsor_id,sponsor_type from kylin_performances kp\n" + String sql = "select sponsor_id,sponsor_type from kylin_performances kp\n" +
// "inner join kylin_performance_status kps on kps.performance_id = kp.performances_id\n" + "inner join kylin_performance_status kps on kps.performance_id = kp.performances_id\n" +
// "where status >=3 and sponsor_id != ''\n" + "where status >=3 and sponsor_id != ''\n" +
// "group by sponsor_id,sponsor_type;"; "group by sponsor_id,sponsor_type;";
// Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD); Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD);
// //查询数据 //查询数据
// PreparedStatement preparedStatement = connection.prepareStatement(sql); PreparedStatement preparedStatement = connection.prepareStatement(sql);
// ResultSetImpl row = (ResultSetImpl) preparedStatement.executeQuery(); ResultSetImpl row = (ResultSetImpl) preparedStatement.executeQuery();
// //数据迁移 //数据迁移
// while (row.next()) { while (row.next()) {
// String sponsorId = row.getString("sponsor_id"); String sponsorId = row.getString("sponsor_id");
// String sponsorType =row.getString("sponsor_type"); String sponsorType = row.getString("sponsor_type");
// if(mobile==null){ String sponsorSql = "";
// continue; if (sponsorType.equals("brand")) {
// } sponsorSql="select b.name, m.id, m.mobile from mall.brands b inner join mall.merchants m on m.id = b.admin_id where b.id = "+sponsorId;
// //获取java用户id } else if (sponsorType.equals("field")) {
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString(); sponsorSql=" select mu.name, m.id, m.mobile from mall.musicians mu inner join mall.merchants m on m.id = mu.admin_id where m.id = "+sponsorId;
// params.add("mobile", mobile); } else if (sponsorType.equals("musician")) {
// MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString(); sponsorSql="select f.name, m.id, m.mobile from mall.fields f inner join mall.merchants m on m.id = f.admin_id where f.id = "+sponsorId;
// headers.add("Accept", "application/json;charset=UTF-8"); }
// String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/reg/mobile"), params, headers); if (sponsorSql.equals("")) {
// AdamUserInfoVo adamUserInfoVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserInfoVo>>() { continue;
// }).getData(); }
// String uid = adamUserInfoVo.getUid(); PreparedStatement preparedStatementSponsor = connection.prepareStatement(sql);
// KylinPerformanceRelations kylinPerformanceRelations = KylinPerformanceRelations.getNew(); ResultSetImpl rowSponsor = (ResultSetImpl) preparedStatementSponsor.executeQuery();
// kylinPerformanceRelations.setMerchantId(uid); while (rowSponsor.next()) {
// kylinPerformanceRelationsMapper.update(kylinPerformanceRelations,
// Wrappers.lambdaUpdate(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getMerchantId, merchantId)); }
// rowSponsor.close();
// HashMap<String,Object> map = CollectionUtil.mapStringObject(); preparedStatementSponsor.close();
// map.put("merchantId",merchantId); }
// //修改vo row.close();
// Query voQuery = Query.query(Criteria.where("merchantId").is(merchantId)); preparedStatement.close();
// BasicDBObject objectVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map)); } catch (Exception e) {
// mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne( e.printStackTrace();
// voQuery.getQueryObject(), }
// objectVo }
// );
// //修改partnerVo
// Query partnerVoQuery = Query.query(Criteria.where("merchantId").is(merchantId));
// BasicDBObject objectPartnerVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
// mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
// partnerVoQuery.getQueryObject(),
// objectPartnerVo
// );
// }
// row.close();
// preparedStatement.close();
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//相关权限迁移 //相关权限迁移
......
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