szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop

This commit is contained in:
Owen 2025-03-06 18:06:42 +08:00
parent bda92676f1 0d4b13c396
commit 705424ea29
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orderCatch/OrderCatchController.java
View File

@ -30,7 +30,7 @@ public class OrderCatchController {
@PermitAll
@RequestMapping("/catch")
@Operation(summary = "抓取订单")
public String catchOrders(@Valid @RequestBody List<Message> messages) {
public String catchOrders(@Valid @RequestBody List<Message<String>> messages) {
// 异步处理订单数据
// execCatchOrders(messages);
orderMessageProducer.sendSmsSendMessage(messages);
@ -43,7 +43,7 @@ public class OrderCatchController {
* @param messages
*/
@Async
public void execCatchOrders(List<Message> messages) {
public void execCatchOrders(List<Message<String>> messages) {
TenantContextHolder.setTenantId(162L);
orderCatchService.catchOrders(messages);
}

2
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orderCatch/po/DouDianOrderMessage.java
View File

@ -17,5 +17,5 @@ public class DouDianOrderMessage implements Serializable {
/**
* 消息内容
*/
private List<Message> messages;
private List<Message<String>> messages;
}

18
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
View File

@ -105,21 +105,21 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
* @param catchRepVO
*/
@Override
public void catchOrders(List<Message> catchRepVO) {
public void catchOrders(List<Message<String>> catchRepVO) {
// 插入日志
log.info("抖音消息推送订单，抓取/更新 订单");
log.error("抖音订单推送:{}", JsonUtil.toJson(catchRepVO));
try {
Gson gson = new Gson();
for (Message message : catchRepVO) {
for (Message<String> message : catchRepVO) {
String tag = message.getTag();
String msgId = message.getMsgId();
Object data = message.getData();
String data = message.getData();
// 插入日志
if("200".equals(tag)){
// 200 doudian_refund_RefundCreated
// 买家发起售后申请消息
RefundRefundCreatedParam refundRefundCreatedParam = gson.fromJson(message.getData()+"", RefundRefundCreatedParam.class);
RefundRefundCreatedParam refundRefundCreatedParam = gson.fromJson(data, RefundRefundCreatedParam.class);
Long pId = refundRefundCreatedParam.getPId();
// 更新订单取消
List<OrdersDO> ordersDOS = ordersMapper.selectList(new LambdaQueryWrapperX<OrdersDO>().eq(OrdersDO::getRealSourceId, pId).eq(OrdersDO::getDeleted, 0));
@ -132,7 +132,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
} else if("201".equals(tag)) {
// 201 doudian_refund_RefundAgreed
// 同意退款消息
RefundRefundAgreedParam refundRefundAgreedParam = gson.fromJson(message.getData()+"", RefundRefundAgreedParam.class);
RefundRefundAgreedParam refundRefundAgreedParam = gson.fromJson(data, RefundRefundAgreedParam.class);
Long pId = refundRefundAgreedParam.getPId();
List<OrdersDO> ordersDOS = ordersMapper.selectList(new LambdaQueryWrapperX<OrdersDO>().eq(OrdersDO::getRealSourceId, pId).eq(OrdersDO::getDeleted, 0));
if(CollectionUtil.isNotEmpty(ordersDOS)){
@ -144,7 +144,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
} else if("202".equals(tag)) {
// 202 doudian_refund_ReturnApplyAgreed
// 同意退货申请消息
RefundReturnApplyAgreedParam refundReturnApplyAgreedParam = gson.fromJson(message.getData()+"", RefundReturnApplyAgreedParam.class);
RefundReturnApplyAgreedParam refundReturnApplyAgreedParam = gson.fromJson(data, RefundReturnApplyAgreedParam.class);
Long pId = refundReturnApplyAgreedParam.getPId();
List<OrdersDO> ordersDOS = ordersMapper.selectList(new LambdaQueryWrapperX<OrdersDO>().eq(OrdersDO::getRealSourceId, pId).eq(OrdersDO::getDeleted, 0));
if(CollectionUtil.isNotEmpty(ordersDOS)){
@ -156,7 +156,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
} else if("101".equals(tag)) {
// 101 doudian_trade_TradePaid
// 订单支付/确认消息 抓取订单
TradeTradePaidParam tradeTradePaidParam = gson.fromJson(message.getData()+"", TradeTradePaidParam.class);
TradeTradePaidParam tradeTradePaidParam = gson.fromJson(data, TradeTradePaidParam.class);
// 订单id
for (Long sId : tradeTradePaidParam.getSIds()) {
orderToDataBase(sId);
@ -164,7 +164,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
} else if("106".equals(tag)) {
// 106 doudian_trade_TradeCanceled
// 订单取消消息
TradeTradeCanceledParam tradeTradeCanceledParam = gson.fromJson(message.getData()+"", TradeTradeCanceledParam.class);
TradeTradeCanceledParam tradeTradeCanceledParam = gson.fromJson(data, TradeTradeCanceledParam.class);
Long pId = tradeTradeCanceledParam.getPId();
// 更新订单取消
List<OrdersDO> ordersDOS = ordersMapper.selectList(new LambdaQueryWrapperX<OrdersDO>().eq(OrdersDO::getRealSourceId, pId).eq(OrdersDO::getDeleted, 0));
@ -177,7 +177,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
} else if("110".equals(tag)) {
// 110 doudian_trade_TradePending
// 订单已支付待处理
TradeTradePendingParam tradeTradePendingParam = gson.fromJson(message.getData()+"", TradeTradePendingParam.class);
TradeTradePendingParam tradeTradePendingParam = gson.fromJson(data, TradeTradePendingParam.class);
// 订单id
for (Long sId : tradeTradePendingParam.getSIds()) {
orderToDataBase(sId);

2
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/OrderCatchService.java
View File

@ -11,5 +11,5 @@ public interface OrderCatchService {
*/
void syncOrder(AccessToken accessToken, long createTimeStart, long createTimeEnd);
void catchOrders(List<Message> catchRepVO);
void catchOrders(List<Message<String>> catchRepVO);
}

4
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/OrderMessageProducer.java
View File

@ -24,13 +24,13 @@ public class OrderMessageProducer {
*
* @param messages 消息内容
*/
public void sendSmsSendMessage(List<Message> messages) {
public void sendSmsSendMessage(List<Message<String>> messages) {
DouDianOrderMessage message = new DouDianOrderMessage();
message.setMessages(messages);
// 为消息添加唯一ID
CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString());
String jsonStr = JSONUtil.toJsonStr(message);
log.error("订单消息内容：{}", jsonStr);
rabbitTemplate.convertAndSend(DouDianOrderMessage.QUEUE, Optional.ofNullable(jsonStr), correlationData);
rabbitTemplate.convertAndSend(DouDianOrderMessage.QUEUE, (Object) jsonStr, correlationData);
}
}

12
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java
View File

@ -105,7 +105,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
// 并且根据上游下单结果处理ordersDO
// 最后把 处理后的ordersDO 更新存入数据库
ordersDO = handleOrderCreate(ordersDO);
this.updateOrderById(ordersDO);
ordersService.updateOrderById(ordersDO);
return orderId;
}
@ -317,7 +317,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
canAudit = false;
}
}
this.updateOrderById(updateObj);
ordersService.updateOrderById(updateObj);
// 异步处理 审核成功是否自动进单
Integer autoType = oldOrderDo.getAutoType();
// 联合条件： 自动生产 && 审核通过 && 提交初审
@ -452,7 +452,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
Integer autoType = haoKaProduct.getAutoType();
updateObj.setAutoType(autoType);
this.updateOrderById(updateObj);
ordersService.updateOrderById(updateObj);
Long status = updateObj.getStatus();
// 进入审核流程
log.error("【审核订单开始】,订单状态：{}",status);
@ -473,7 +473,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
// 手动生产
log.error("【审核订单手动】,订单数据：{}",JSON.toJSONString(updateObj));
updateObj.setStatus(450L);
this.updateOrderById(updateObj);
ordersService.updateOrderById(updateObj);
}
}
@ -540,7 +540,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
ordersDO.setStatus(-460L);
ordersDO.setUpstreamOrderStatus(-460);
}
this.updateOrderById(ordersDO);
ordersService.updateOrderById(ordersDO);
}
/**
@ -602,7 +602,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
}
orderOperateLogService.createOrderOperateLog(logSaveReqVO);
// 更新订单
this.updateOrderById(ordersDO);
ordersService.updateOrderById(ordersDO);
return ordersDO;
}