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-03 17:46:41 +08:00
parent 20af8e34fa ed65ed80c9
commit e4932e1f3c
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,7 +348,9 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
ordersDO.setAddressCityCode(city.getId());
// 区
ordersDO.setAddressDistrict(town.getName());
ordersDO.setAddressDistrictCode(town.getId());
if(town.getId().length() >= 6){
ordersDO.setAddressDistrictCode(town.getId().substring(0,6));
}
// 街道/镇
ordersDO.setTown(street.getName());
// 详细地址
@ -546,7 +548,9 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
ordersDO.setAddressCityCode(city.getId());
// 区
ordersDO.setAddressDistrict(town.getName());
ordersDO.setAddressDistrictCode(town.getId());
if(town.getId().length() >= 6){
ordersDO.setAddressDistrictCode(town.getId().substring(0,6));
}
// 街道/镇
ordersDO.setTown(street.getName());
// 详细地址

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

@ -25,7 +25,9 @@ import cn.iocoder.yudao.module.haoka.utils.IdCardAgeCalculator;
import cn.iocoder.yudao.module.haoka.utils.SnowflakeId;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.doudian.open.api.order_addOrderRemark.param.OrderAddOrderRemarkParam;
import com.doudian.open.utils.JsonUtil;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Async;
@ -60,6 +62,7 @@ import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.*;
*/
@Service
@Validated
@Slf4j
public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> implements OrdersService {
@Resource
private OrdersMapper ordersMapper;
@ -317,15 +320,24 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
@Override
public void afterCommit() {
//异步操作
OrdersSaveReqVO ordersSaveReqVO = new OrdersSaveReqVO();
ordersSaveReqVO.setId(updateObj.getId());
ordersSaveReqVO.setStatus(450L);
auditOrders(ordersSaveReqVO);
asyncAuditOrders(updateObj);
}
});
}
}
/**
* 异步判断是否自动审核订单
* @param ordersDO
*/
@Async
public void asyncAuditOrders(OrdersDO ordersDO){
// 自动生产 调用审核
OrdersSaveReqVO ordersSaveReqVO = BeanUtils.toBean(ordersDO, OrdersSaveReqVO.class);
ordersSaveReqVO.setStatus(450L);
this.auditOrders(ordersSaveReqVO);
}
/**
* 判断手机号和身份证是否在黑名单中
* @param list
@ -407,6 +419,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
@Override
public void auditOrders(OrdersSaveReqVO updateReqVO) {
log.error("【审核订单开始】,订单数据{}", JsonUtil.toJson(updateReqVO));
// 校验存在
OrdersDO ordersOld = validateOrdersExists(updateReqVO.getId());
// 校验是否可以审核
@ -422,6 +435,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
this.updateOrderById(updateObj);
Long status = updateObj.getStatus();
// 进入审核流程
log.error("【审核订单开始】,订单状态：{}",status);
if (status != null && status == 450L) {
// 450 审核通过
if ("2".equals(String.valueOf(autoType))) {
@ -431,10 +445,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
logSaveReqVO.setMsg("已自动提交到上游");
logSaveReqVO.setMsgType("0");
logSaveReqVO.setMsgSource("1");
log.error("【审核订单自动生产】,操作日志数据：{}",JsonUtil.toJson(logSaveReqVO));
orderOperateLogService.createOrderOperateLog(logSaveReqVO);
log.error("【审核订单自动提交上游】,订单数据：{}",JsonUtil.toJson(updateObj));
createOrderToOperators(updateObj);
} else {
// 手动生产
log.error("【审核订单手动】,订单数据：{}",JsonUtil.toJson(updateObj));
updateObj.setStatus(450L);
this.updateOrderById(updateObj);
}