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

Skip to content

L
liquidnet-bus-v1
Commit 12db4e86 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'dev' into test

parents 7fd431c9 0a690b34
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 39 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
View file @ 12db4e86
......@@ -62,7 +62,7 @@ public interface IKylinOrderTicketsService {
ResponseDto<String> sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList);
//退款撤回
Boolean orderRefundWithdraw(String orderRefundsId);
ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId);
//退款再次申请
Boolean orderRefundAgain(String orderRefundsId);
......
liquidnet-bus-common/liquidnet-common-mq/src/main/java/com/liquidnet/common/mq/constant/MQConst.java
View file @ 12db4e86
......@@ -56,6 +56,11 @@ public class MQConst {
public static final String ROUTING_KEY_SQL_ORDER_WITHDRAW = "order.withdraw";
public static final String QUEUES_SQL_ORDER_WITHDRAW = "queue.sql.order.withdraw";
//超时支付申请退款
public static final String EXCHANGES_LIQUIDNET_SQL_ORDER_OVERTIME_REFUND = "liquidnet.sql.order.overtimeRefund";
public static final String ROUTING_KEY_SQL_ORDER_OVERTIME_REFUND = "order.overtimeRefund";
public static final String QUEUES_SQL_ORDER_OVERTIME_REFUND = "queue.sql.order.overtimeRefund";
/* -------------------------------------------------------- */
// 验票更新
......
liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java
View file @ 12db4e86
......@@ -529,4 +529,14 @@ public class ConsumerProcessor {
log.info("=== CONSUMER_ORDER_WITHDRAW ===");
this.consumerSqlDaoHandler(msg, channel);
}
// 超时支付申请退款
@RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_OVERTIME_REFUND), key = MQConst.ROUTING_KEY_SQL_ORDER_OVERTIME_REFUND,
value = @Queue(MQConst.QUEUES_SQL_ORDER_OVERTIME_REFUND)
))
public void consumerOrderOvertimeRefund(Message msg, Channel channel) {
log.info("=== CONSUMER_ORDER_OVERTIME_REFUND ===");
this.consumerSqlDaoHandler(msg, channel);
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @ 12db4e86
......@@ -122,7 +122,7 @@ public class KylinOrderTicketsController {
@ApiOperation("发起退款撤回")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Boolean> orderRefundWithdraw(@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
return orderTicketsService.orderRefundWithdraw(orderRefundId) == null ? ResponseDto.failure() : ResponseDto.success();
return orderTicketsService.orderRefundWithdraw(orderRefundId);
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 12db4e86
......@@ -1205,7 +1205,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
@Override
public Boolean orderRefundWithdraw(String orderRefundsId) {
public ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId) {
LinkedList<String> sqls = new LinkedList<>();
LinkedList<Object[]> sqlsDataA = new LinkedList<>();
......@@ -1216,6 +1216,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
String strTime = DateUtil.Formatter.yyyyMMddHHmmss.format(time);
try {
KylinOrderRefundsVoBase orderRefundsVo = dataUtils.getOrderRefundVo(orderRefundsId);
if(!orderRefundsVo.getStatus().equals(0)){
return ResponseDto.failure("当前状态不可撤回");
}
List<KylinOrderRefundEntitiesVo> refundEntities = orderRefundsVo.getOrderRefundEntitiesVoList();
String orderTicketsId = orderRefundsVo.getOrderTicketsId();
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderTicketsId);
......@@ -1256,10 +1259,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
kylinOrderTicketVo.setUpdatedAt(strTime);
kylinOrderTicketVo.setChangeDate(time);
BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
// mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
// orderObject
// );
mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
orderObject
);
dataUtils.delOrderTicketRedis(orderTicketsId);
mongoVoUtils.resetOrderListVo(orderTicketVo.getUserId(), 2, orderTicketsId, null);
......@@ -1307,10 +1310,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
kylinOrderTicketEntitiesVo.setChangeDate(time);
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
// mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("orderTicketEntitiesId").is(item.getOrderTicketEntitiesId())).getQueryObject(),
// entitiesObject
// );
mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketEntitiesId").is(item.getOrderTicketEntitiesId())).getQueryObject(),
entitiesObject
);
dataUtils.delOrderTicketEntitiesRedis(item.getOrderTicketEntitiesId());
}
......@@ -1324,10 +1327,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderRefundsVoBase.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
orderRefundsVoBase.setUpdatedAt(strTime);
BasicDBObject refundObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(orderRefundsVoBase)));
// mongoTemplate.getCollection(KylinOrderRefundsVoBase.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
// refundObject
// );
mongoTemplate.getCollection(KylinOrderRefundsVoBase.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
refundObject
);
sqlsDataC.add(new Object[]{
orderRefundsVoBase.getStatus(), orderRefundsVoBase.getUpdatedAt(), orderRefundsId
......@@ -1339,10 +1342,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW, MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
return true;
return ResponseDto.success(true);
} catch (Exception e) {
e.printStackTrace();
return false;
return ResponseDto.failure("当前状态不可撤回");
}
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 12db4e86
......@@ -102,8 +102,12 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr);
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
for (String v : ticketEntityIds) {
LinkedList<Object[]> sqlsDataB = new LinkedList<>();
for (String v : ticketEntityIds) {
sqlsDataB.add(new Object[]{
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), v
});
/*kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
.eq("order_ticket_entities_id", v));*/
......@@ -149,12 +153,17 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities();
kylinOrderRefundEntities.setOrderRefundsId(orderRefundsId);
kylinOrderRefundEntities.setCreatedAt(LocalDateTime.now());
LinkedList<Object[]> sqlsDataD = new LinkedList<>();
for (int i = 0; i <= ticketEntityIds.size() - 1; i++) {
String orderRefundsEntitiesId = IDGenerator.nextSnowId();
kylinOrderRefundEntities.setOrderRefundsEntitiesId(orderRefundsEntitiesId);
kylinOrderRefundEntities.setRefundPrice(BigDecimal.valueOf(entitiesPrice.get(i)));
kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i));
sqlsDataD.add(new Object[]{
kylinOrderRefundEntities.getOrderRefundsEntitiesId(), kylinOrderRefundEntities.getOrderRefundsId(), kylinOrderRefundEntities.getRefundPrice(),
kylinOrderRefundEntities.getOrderTicketEntitiesId(), kylinOrderRefundEntities.getCreatedAt()
});
/*int rowsR = kylinOrderRefundsEntitiesMapper.insert(kylinOrderRefundEntities);*/
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = new KylinOrderRefundEntitiesVo();
......@@ -162,6 +171,31 @@ public class KylinRefundsStatusServiceImpl {
mongoTemplate.insert(orderRefundEntitiesVo,KylinOrderRefundEntitiesVo.class.getSimpleName());
}
//mq更改数据库
LinkedList<String> sqls = new LinkedList<>();
LinkedList<Object[]> sqlsDataA = new LinkedList<>();
LinkedList<Object[]> sqlsDataC = new LinkedList<>();
sqls.add(SqlMapping.get("kylin_order_ticket_status.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_ticket_entities.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_refund.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
sqlsDataA.add(new Object[]{
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId()
});
sqlsDataC.add(new Object[]{
kylinOrderRefunds.getOrderRefundsId(), kylinOrderRefunds.getOrderTicketsId(), kylinOrderRefunds.getOrderRefundCode(),
kylinOrderRefunds.getPrice(), kylinOrderRefunds.getPriceExpress(), kylinOrderRefunds.getStatus(),
kylinOrderRefunds.getType(), kylinOrderRefunds.getApplicantId(), kylinOrderRefunds.getApplicantName(),
kylinOrderRefunds.getApplicantAt(), kylinOrderRefunds.getReason(),
kylinOrderRefunds.getRefundCate(), kylinOrderRefunds.getCreatedAt()
});
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_OVERTIME_REFUND, MQConst.ROUTING_KEY_SQL_ORDER_OVERTIME_REFUND,
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD));
return true;
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties
View file @ 12db4e86
......@@ -44,5 +44,11 @@ kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status =
kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ? WHERE order_refunds_id = ?
# ------------------------超时支付申请退款----------------------------
kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ? WHERE order_id = ?
kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ? WHERE order_ticket_entities_id = ?
kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/adam/PlatformDMController.java
View file @ 12db4e86
......@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.controller.adam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.common.exception.LiquidnetServiceException;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.platform.service.impl.adam.dm.processor.*;
import io.swagger.annotations.Api;
......@@ -9,12 +10,17 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.time.temporal.ChronoField;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;
@ApiSupport(order = 90062)
@Api(tags = "DM")
......@@ -44,17 +50,18 @@ public class PlatformDMController {
@Autowired
DMCollectionProcessor dmCollectionProcessor;
// @ModelAttribute
// public void accessExecuting(HttpServletRequest request) {
// String alis = request.getHeader("alis");
// LocalDateTime now = LocalDateTime.now();
// int hour = now.get(ChronoField.HOUR_OF_DAY), minute = now.getMinute(), dom = now.get(ChronoField.DAY_OF_MONTH);;
// String lns = "^(" + (dom % 10) + hour % (minute / 10 + 1) + "[A-Z]{2})" + minute / 10 + "[0-9]{1}$";
// log.info("lns:{},alis:{}", lns, alis);
// if (StringUtils.isEmpty(alis) || !Pattern.matches(lns, alis)) {
// throw new LiquidnetServiceException("44444", "非法操作");
// }
// }
@ModelAttribute
public void accessExecuting(HttpServletRequest request) {
String alis = request.getHeader("alis");
LocalDateTime now = LocalDateTime.now();
int hour = now.get(ChronoField.HOUR_OF_DAY), minute = now.getMinute(), dom = now.get(ChronoField.DAY_OF_MONTH);;
String lns = "^(" + (dom % 10) + hour % (minute / 10 + 1) + "[A-Z]{2})" + minute / 10 + "[0-9]{1}$";
log.info("lns:{},alis:{}", lns, alis);
if (StringUtils.isEmpty(alis) || !Pattern.matches(lns, alis)) {
throw new LiquidnetServiceException("44444", "非法操作");
}
log.info("uri:[{}],Parameter:{}", request.getRequestURI(), request.getParameterMap());
}
@ApiOperationSupport(order = 1)
@ApiOperation(value = "T - user")
......@@ -96,7 +103,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) {
......@@ -125,7 +131,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) {
......@@ -154,7 +159,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) {
......@@ -183,7 +187,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) {
......@@ -212,7 +215,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) {
......@@ -241,7 +243,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) {
......@@ -267,7 +268,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dG);
}
......@@ -280,7 +280,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dG);
}
......@@ -293,7 +292,6 @@ public class PlatformDMController {
@RequestParam(required = false) String flg,
@RequestParam(required = false) String flu
) {
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
dmTracesInfoProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dG);
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java
View file @ 12db4e86
......@@ -325,6 +325,7 @@ public class PerformanceVoTask {
KylinTicketRelations ticketRelations = new KylinTicketRelations();
BeanUtils.copyProperties(kylinTicketPartnerVo, ticketRelations);
tickets.setPayCountdownMinute(kylinPerformanceMisVo.getPayCountdownMinute());
tickets.setPriceExpress(new BigDecimal("0.00"));
tickets.setPriceDiscountMember(new BigDecimal("0.00"));
tickets.setPriceDiscount(new BigDecimal("0.00"));
......
pom.xml
View file @ 12db4e86
......@@ -34,7 +34,7 @@
<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
<mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
<mysql-connector-java.version>8.0.23</mysql-connector-java.version>
<mysql-connector-java.version>8.0.19</mysql-connector-java.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<junit.version>5.7.1</junit.version>
......
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