From b5825192813bd5dcc9e428f1c97ef3def2ba95c7 Mon Sep 17 00:00:00 2001 From: Damonny <826010988@qq.com> Date: Mon, 3 Mar 2025 17:10:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BF=9B=E7=94=9F=E4=BA=A7=E7=9A=84=E9=97=AE=E9=A2=98,?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../haoka/service/orders/OrdersServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java index a7f5f4bea7..cf687b7bf2 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java @@ -317,15 +317,24 @@ public class OrdersServiceImpl extends ServiceImpl 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 From cb990f37c67dabebcc576f0970515d0698a16497 Mon Sep 17 00:00:00 2001 From: Damonny <826010988@qq.com> Date: Mon, 3 Mar 2025 17:24:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/orderCatch/DouDianOrderCatchServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java index 4dba2cf6b7..7d5ac9ea46 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java @@ -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()); // 详细地址 From ed65ed80c998e0ff6b2c9cd800a64cc9c957c5f1 Mon Sep 17 00:00:00 2001 From: Damonny <826010988@qq.com> Date: Mon, 3 Mar 2025 17:31:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/haoka/service/orders/OrdersServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java index cf687b7bf2..4ad08f8453 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java @@ -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 implements OrdersService { @Resource private OrdersMapper ordersMapper; @@ -416,6 +419,7 @@ public class OrdersServiceImpl extends ServiceImpl imple @Override public void auditOrders(OrdersSaveReqVO updateReqVO) { + log.error("【审核订单开始】,订单数据{}", JsonUtil.toJson(updateReqVO)); // 校验存在 OrdersDO ordersOld = validateOrdersExists(updateReqVO.getId()); // 校验是否可以审核 @@ -431,6 +435,7 @@ public class OrdersServiceImpl extends ServiceImpl imple this.updateOrderById(updateObj); Long status = updateObj.getStatus(); // 进入审核流程 + log.error("【审核订单开始】,订单状态：{}",status); if (status != null && status == 450L) { // 450 审核通过 if ("2".equals(String.valueOf(autoType))) { @@ -440,10 +445,13 @@ public class OrdersServiceImpl extends ServiceImpl 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); }