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

Commit ed600c51 authored by jiangxiulong's avatar jiangxiulong

Merge branch 'dev' into test

parents defc677a 878d1358
......@@ -285,8 +285,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
break;
case "reject":
boolean cancelRes = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList, false);
log.info("取消处理" + cancelRes);
log.info("取消处理ing");
res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
break;
case "unfilled":
......
......@@ -95,7 +95,8 @@ public class KylinRefundPerformancesAdminServiceImpl {
KylinOrderRefundBatches refundBatchesInfo = kylinOrderRefundBatchesMapper.selectLastOne(targetId);
if (refundBatchesInfo == null ||
refundBatchesInfo.getStatus() == KylinTableStatusConst.STATUS_CANCEL ||
refundBatchesInfo.getStatus() == KylinTableStatusConst.STATUS_FINANCE_ADOPT
refundBatchesInfo.getStatus() == KylinTableStatusConst.STATUS_FINANCE_ADOPT ||
refundBatchesInfo.getStatus() == KylinTableStatusConst.STATUS_OPERATE_REJECT
) {
// 添加演出退款记录
String refundBatchId = IDGenerator.nextSnowId();
......
......@@ -232,7 +232,6 @@ public class KylinRefundsStatusServiceImpl {
.ne("order_refunds_id", orderRefundsId)
);
log.info("refundingCount" + refundingCount);
if (refundingCount > 0) { // 存在其他正在退款的订单
newStatus = KylinTableStatusConst.ORDER_STATUS3;
} else {
......@@ -334,21 +333,17 @@ public class KylinRefundsStatusServiceImpl {
}
public boolean orderRefundChangeStatus(List<KylinOrderRefunds> refundList, String type, String reject, String refuse) {
log.info("orderRefundChangeStatus ----- in");
String authId = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName();
KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
log.info("type" + type);
switch (type) {
case "reapply":
log.info("type-1");
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
kylinOrderRefunds.setApplicantId(authId);
kylinOrderRefunds.setApplicantName(authName);
kylinOrderRefunds.setApplicantAt(LocalDateTime.now());
break;
case "approved":
log.info("type-2");
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED);
kylinOrderRefunds.setAuditorId(authId);
kylinOrderRefunds.setAuditorName(authName);
......@@ -356,7 +351,6 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefunds.setReject(reject);
break;
case "reject":
log.info("type-reject" + type);
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT);
kylinOrderRefunds.setAuditorId(authId);
kylinOrderRefunds.setAuditorName(authName);
......@@ -364,7 +358,6 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefunds.setReject(reject);
break;
case "refuse":
log.info("type-3");
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE);
kylinOrderRefunds.setExecutorId(authId);
kylinOrderRefunds.setExecutorName(authName);
......@@ -384,13 +377,10 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefunds,
new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", orderRefundIds)
);
log.info("type-4");
// 修改缓存
KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
kylinOrderRefundsVo.setUpdatedAt(LocalDateTime.now());
kylinOrderRefundsVo.setReason("11111");
log.info("kylinOrderRefundsVo-"+kylinOrderRefundsVo.getStatus());
for (String refundId : orderRefundIds) {
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
......@@ -405,7 +395,6 @@ public class KylinRefundsStatusServiceImpl {
);*/
dataUtils.delOrderRefundVo(orderRefundIds);
dataUtils.delOrderRefundVoByOrderId(orderIds);
log.info("type-5");
return true;
}
......@@ -444,7 +433,6 @@ public class KylinRefundsStatusServiceImpl {
// sign = MD5.getStrMD5(sign);
sign = sign.toUpperCase();
params.add("sign", sign);*/
log.info("退款url" + applyUrl);
log.info("退款参数" + JsonUtils.toJson(params));
// 请求pay
String postResult = null;
......@@ -453,7 +441,6 @@ public class KylinRefundsStatusServiceImpl {
log.info("退款res" + postResult);
HashMap hashMapResult = JsonUtils.fromJson(postResult, HashMap.class);
Boolean success = (Boolean) hashMapResult.get("success");
log.info("success" + success.toString());
if (!success) {
String msg = (String) hashMapResult.get("message");
log.info("退款pay返回失败" + msg);
......@@ -462,7 +449,6 @@ public class KylinRefundsStatusServiceImpl {
} catch (Exception e) {
log.info("退款请求pay失败e" + e.getMessage());
}
log.info("success111");
// 更新退款表
kylinOrderRefundsMapper.update(
kylinOrderRefunds,
......
......@@ -20,6 +20,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartner
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
......@@ -39,6 +40,7 @@ import java.util.HashMap;
import java.util.List;
@Component
@Slf4j
public class PerformanceVoUtils {
@Autowired
......@@ -275,19 +277,22 @@ public class PerformanceVoUtils {
//场次数据
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = getTimesMongoList(performancesId);
int isMember = 0;
try {
for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
//修改票
List<KylinTicketPartnerVo> kylinTicketPartnerVoList = getTicketMongoList(ticketTimeItem.getTicketTimesId());
for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
if (ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketItem.getTicketsId())).getIsMember().equals(1)) {
for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
//修改票
List<KylinTicketPartnerVo> kylinTicketPartnerVoList = getTicketMongoList(ticketTimeItem.getTicketTimesId());
for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
try {
KylinTicketStatus statusData = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketItem.getTicketsId()));
log.info("isMember = ", statusData);
if (statusData.getIsMember().equals(1)) {
isMember = 1;
break;
}
} catch (Exception e) {
log.info("isMember = ", e);
}
}
}catch (Exception e){
}
for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
......@@ -425,7 +430,7 @@ public class PerformanceVoUtils {
}
public List<KylinTicketTimesPartnerVo> getTimesMongoList(String performancesId) {
return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)).with(Sort.by(Sort.Direction.DESC, "createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)).with(Sort.by(Sort.Direction.ASC, "createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
}
}
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