格式修改
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
package com.baiyue.order.controller;
|
||||
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
import com.baiyue.common.core.api.ApiResponse;
|
||||
import com.baiyue.common.core.api.ResultCode;
|
||||
import com.baiyue.common.core.exception.BizException;
|
||||
@@ -19,13 +22,13 @@ import java.security.MessageDigest;
|
||||
@RestController
|
||||
@RequestMapping("/internal/order/v1/cargoes")
|
||||
public class InternalOrderCargoController {
|
||||
private final OrderRepository orders;
|
||||
private final byte[] expectedToken;
|
||||
@Resource private OrderRepository orders;
|
||||
@Value("${baiyue.security.internal-service-token}") private String internalToken;
|
||||
private byte[] expectedToken;
|
||||
|
||||
public InternalOrderCargoController(OrderRepository orders,
|
||||
@Value("${baiyue.security.internal-service-token}") String token) {
|
||||
this.orders = orders;
|
||||
this.expectedToken = token.getBytes(StandardCharsets.UTF_8);
|
||||
@PostConstruct
|
||||
void initializeToken() {
|
||||
expectedToken = internalToken.getBytes(StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
@GetMapping("/{tenantId}/{orderId}/{cargoId}")
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.baiyue.order.repository;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
import com.baiyue.common.core.api.PageResult;
|
||||
import com.baiyue.order.dto.OrderRequests;
|
||||
import com.baiyue.order.dto.MerchantInboundOrderQuery;
|
||||
@@ -22,28 +24,14 @@ import java.time.LocalDateTime;
|
||||
*/
|
||||
@Repository
|
||||
public class OrderRepository {
|
||||
private final OrderMapper orderMapper;
|
||||
private final OrderCargoMapper cargoMapper;
|
||||
private final OrderPartyMapper partyMapper;
|
||||
private final OrderInternalNoteMapper noteMapper;
|
||||
private final OrderStatusHistoryMapper historyMapper;
|
||||
private final OutboxEventMapper outboxMapper;
|
||||
private final OrderChildPurgeMapper childPurgeMapper;
|
||||
private final OrderIdempotencyRecordMapper idempotencyMapper;
|
||||
|
||||
public OrderRepository(OrderMapper orderMapper, OrderCargoMapper cargoMapper, OrderPartyMapper partyMapper,
|
||||
OrderInternalNoteMapper noteMapper, OrderStatusHistoryMapper historyMapper,
|
||||
OutboxEventMapper outboxMapper, OrderChildPurgeMapper childPurgeMapper,
|
||||
OrderIdempotencyRecordMapper idempotencyMapper) {
|
||||
this.orderMapper = orderMapper;
|
||||
this.cargoMapper = cargoMapper;
|
||||
this.partyMapper = partyMapper;
|
||||
this.noteMapper = noteMapper;
|
||||
this.historyMapper = historyMapper;
|
||||
this.outboxMapper = outboxMapper;
|
||||
this.childPurgeMapper = childPurgeMapper;
|
||||
this.idempotencyMapper = idempotencyMapper;
|
||||
}
|
||||
@Resource private OrderMapper orderMapper;
|
||||
@Resource private OrderCargoMapper cargoMapper;
|
||||
@Resource private OrderPartyMapper partyMapper;
|
||||
@Resource private OrderInternalNoteMapper noteMapper;
|
||||
@Resource private OrderStatusHistoryMapper historyMapper;
|
||||
@Resource private OutboxEventMapper outboxMapper;
|
||||
@Resource private OrderChildPurgeMapper childPurgeMapper;
|
||||
@Resource private OrderIdempotencyRecordMapper idempotencyMapper;
|
||||
|
||||
public void insertOrder(OrderEntity order) { orderMapper.insert(order); }
|
||||
public int saveOrder(OrderEntity order) { return orderMapper.updateById(order); }
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.baiyue.order.service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
import com.baiyue.common.core.api.PageResult;
|
||||
import com.baiyue.common.core.api.ResultCode;
|
||||
import com.baiyue.common.core.exception.BizException;
|
||||
@@ -24,18 +26,9 @@ import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
public class MerchantInboundOrderListService {
|
||||
private final OrderRepository repository;
|
||||
private final FirstlegInboundClient firstleg;
|
||||
private final String internalToken;
|
||||
|
||||
public MerchantInboundOrderListService(
|
||||
OrderRepository repository,
|
||||
FirstlegInboundClient firstleg,
|
||||
@Value("${baiyue.security.internal-service-token}") String internalToken) {
|
||||
this.repository = repository;
|
||||
this.firstleg = firstleg;
|
||||
this.internalToken = internalToken;
|
||||
}
|
||||
@Resource private OrderRepository repository;
|
||||
@Resource private FirstlegInboundClient firstleg;
|
||||
@Value("${baiyue.security.internal-service-token}") private String internalToken;
|
||||
|
||||
public PageResult<MerchantInboundOrderRow> page(long tenantId, MerchantInboundOrderQuery query) {
|
||||
PageResult<OrderEntity> source = repository.merchantInboundPage(tenantId, query);
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.baiyue.order.service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
import com.baiyue.common.core.api.ApiResponse;
|
||||
import com.baiyue.order.client.FirstlegInboundClient;
|
||||
import com.baiyue.order.entity.OutboxEventEntity;
|
||||
@@ -14,19 +16,10 @@ import java.time.LocalDateTime;
|
||||
/** 可靠投递订单审核事件;接收端以订单唯一键保证重复投递安全。 */
|
||||
@Component
|
||||
public class OrderInboundOutboxPublisher {
|
||||
private final OrderRepository repository;
|
||||
private final FirstlegInboundClient client;
|
||||
private final ObjectMapper json;
|
||||
private final String internalToken;
|
||||
|
||||
public OrderInboundOutboxPublisher(OrderRepository repository, FirstlegInboundClient client,
|
||||
ObjectMapper json,
|
||||
@Value("${baiyue.security.internal-service-token}") String internalToken) {
|
||||
this.repository = repository;
|
||||
this.client = client;
|
||||
this.json = json;
|
||||
this.internalToken = internalToken;
|
||||
}
|
||||
@Resource private OrderRepository repository;
|
||||
@Resource private FirstlegInboundClient client;
|
||||
@Resource private ObjectMapper json;
|
||||
@Value("${baiyue.security.internal-service-token}") private String internalToken;
|
||||
|
||||
@Scheduled(fixedDelayString = "${baiyue.order.inbound-outbox.fixed-delay-ms:3000}")
|
||||
public void publishApprovedOrders() {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.baiyue.order.service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
import com.baiyue.common.core.api.ResultCode;
|
||||
import com.baiyue.common.core.api.ApiResponse;
|
||||
import com.baiyue.common.core.exception.BizException;
|
||||
@@ -18,15 +20,11 @@ import org.slf4j.LoggerFactory;
|
||||
@Service
|
||||
public class OrderMasterDataGuard {
|
||||
private static final Logger log = LoggerFactory.getLogger(OrderMasterDataGuard.class);
|
||||
private final WarehouseClient warehouses;
|
||||
private final PartnerClient partners;
|
||||
private final String token;
|
||||
@Resource private WarehouseClient warehouses;
|
||||
@Resource private PartnerClient partners;
|
||||
@Value("${baiyue.security.internal-service-token}") private String token;
|
||||
@Value("${baiyue.warehouse.public-tenant-id:10001}")
|
||||
private long publicTenantId = 10001L;
|
||||
public OrderMasterDataGuard(WarehouseClient warehouses, PartnerClient partners,
|
||||
@Value("${baiyue.security.internal-service-token}") String token) {
|
||||
this.warehouses=warehouses; this.partners=partners; this.token=token;
|
||||
}
|
||||
public Snapshots validate(long tenantId, OrderRequests.SaveRequest request) {
|
||||
try {
|
||||
PartnerClient.Partner partner=request.customerId()==null ? null : loadPartner(tenantId,request.customerId());
|
||||
|
||||
@@ -41,6 +41,6 @@ logging:
|
||||
rollingpolicy:
|
||||
file-name-pattern: "${LOGGING_ROLLING_FILE_NAME_PATTERN:${LOG_PATH:./logs}/${spring.application.name}.%d{yyyy-MM-dd}.%i.log.gz}"
|
||||
max-file-size: "${LOGGING_ROLLING_MAX_FILE_SIZE:100MB}"
|
||||
max-history: "${LOGGING_ROLLING_MAX_HISTORY:30}"
|
||||
max-history: "${LOGGING_ROLLING_MAX_HISTORY:7}"
|
||||
total-size-cap: "${LOGGING_ROLLING_TOTAL_SIZE_CAP:5GB}"
|
||||
clean-history-on-start: "${LOGGING_ROLLING_CLEAN_HISTORY_ON_START:false}"
|
||||
|
||||
Reference in New Issue
Block a user