diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java index 688fe09a..c66517ba 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java @@ -21,6 +21,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StringUtils; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.Date; import java.util.List; import java.util.regex.Matcher; @@ -227,7 +231,9 @@ public class DouOrderServiceImpl extends ServiceImpl order.setProvince(confirmBo.getProvince()); order.setCity(confirmBo.getCity()); order.setTown(confirmBo.getTown()); - order.setOrderTime(douOrder.getCreateTime()!=null?new Date(douOrder.getCreateTime()*1000):new Date()); + LocalDateTime orderTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(douOrder.getCreateTime()), ZoneId.systemDefault()); + order.setOrderTime(douOrder.getCreateTime()!=null?orderTime:LocalDateTime.now()); +// order.setOrderTime(douOrder.getCreateTime()!=null?new Date(douOrder.getCreateTime()*1000):new Date()); order.setShipper(0L); order.setShipStatus(0); order.setCreateTime(new Date()); diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java index 1d6050a2..eedcbe64 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java @@ -32,6 +32,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StringUtils; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.regex.Matcher; @@ -277,7 +281,12 @@ public class PddOrderServiceImpl extends ServiceImpl order.setProvince(confirmBo.getProvince()); order.setCity(confirmBo.getCity()); order.setTown(confirmBo.getTown()); - order.setOrderTime(StringUtils.hasText(pddOrder.getCreatedTime())?DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",pddOrder.getCreatedTime()):new Date()); + // 定义日期时间格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + // 将字符串转换为LocalDateTime + LocalDateTime orderTime = LocalDateTime.parse(pddOrder.getCreatedTime(), formatter); + + order.setOrderTime(StringUtils.hasText(pddOrder.getCreatedTime())?orderTime:LocalDateTime.now()); order.setShipper(0L); order.setShipStatus(0); order.setCreateTime(new Date()); diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java index d503ec6c..0f028643 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java @@ -33,6 +33,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StringUtils; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.regex.Matcher; @@ -236,22 +238,22 @@ public class TaoOrderServiceImpl extends ServiceImpl @Transactional(rollbackFor = Exception.class) @Override public ResultVo confirmOrder(TaoOrderConfirmBo confirmBo) { - TaoOrder pddOrder = mapper.selectById(confirmBo.getOrderId()); - if(pddOrder==null) return ResultVo.error("订单数据不存在"); - if(pddOrder.getAuditStatus()!=0) return ResultVo.error("已经确认过了！"); + TaoOrder taoOrder = mapper.selectById(confirmBo.getOrderId()); + if(taoOrder==null) return ResultVo.error("订单数据不存在"); + if(taoOrder.getAuditStatus()!=0) return ResultVo.error("已经确认过了！"); List pddOrderItems = itemMapper.selectList( new LambdaQueryWrapper() - .eq(TaoOrderItem::getTid, pddOrder.getTid())); + .eq(TaoOrderItem::getTid, taoOrder.getTid())); if(pddOrderItems==null || pddOrderItems.isEmpty()){ return ResultVo.error("找不到订单item"); } - OOrder erpOrder = erpOrderMapper.selectOne(new LambdaQueryWrapper().eq(OOrder::getOrderNum,pddOrder.getTid())); + OOrder erpOrder = erpOrderMapper.selectOne(new LambdaQueryWrapper().eq(OOrder::getOrderNum,taoOrder.getTid())); if(erpOrder!=null) { // 已经确认过了，更新自己 TaoOrder douOrderUpdate = new TaoOrder(); - douOrderUpdate.setId(pddOrder.getId()); + douOrderUpdate.setId(taoOrder.getId()); douOrderUpdate.setAuditStatus(1); douOrderUpdate.setAuditTime(new Date()); mapper.updateById(douOrderUpdate); @@ -259,28 +261,33 @@ public class TaoOrderServiceImpl extends ServiceImpl return ResultVo.error("已经确认过了"); } OOrder order = new OOrder(); - order.setOrderNum(pddOrder.getTid()); + order.setOrderNum(taoOrder.getTid()); order.setShopType(EnumShopType.TAO.getIndex()); - order.setShopId(pddOrder.getShopId()); + order.setShopId(taoOrder.getShopId()); // order.setShipType(confirmBo.getShipType()); order.setShipType(0); - order.setBuyerMemo(pddOrder.getBuyerMemo()); - order.setSellerMemo(pddOrder.getSellerMemo()); + order.setBuyerMemo(taoOrder.getBuyerMemo()); + order.setSellerMemo(taoOrder.getSellerMemo()); order.setRefundStatus(1); order.setOrderStatus(1); - order.setGoodsAmount(pddOrder.getTotalFee()!=null?pddOrder.getTotalFee():0.0); - order.setPostFee(pddOrder.getPostFee()!=null?pddOrder.getPostFee().doubleValue():0.0); - order.setSellerDiscount(pddOrder.getDiscountFee()!=null?pddOrder.getDiscountFee().doubleValue():0.0); + order.setGoodsAmount(taoOrder.getTotalFee()!=null?taoOrder.getTotalFee():0.0); + order.setPostFee(taoOrder.getPostFee()!=null?taoOrder.getPostFee().doubleValue():0.0); + order.setSellerDiscount(taoOrder.getDiscountFee()!=null?taoOrder.getDiscountFee().doubleValue():0.0); order.setPlatformDiscount(0.0); - order.setAmount(pddOrder.getTotalFee()!=null?pddOrder.getTotalFee().doubleValue():0.0); - order.setPayment(pddOrder.getPayment()!=null?pddOrder.getPayment().doubleValue():0.0); + order.setAmount(taoOrder.getTotalFee()!=null?taoOrder.getTotalFee().doubleValue():0.0); + order.setPayment(taoOrder.getPayment()!=null?taoOrder.getPayment().doubleValue():0.0); order.setReceiverName(confirmBo.getReceiver()); order.setReceiverMobile(confirmBo.getMobile()); order.setAddress(confirmBo.getAddress()); order.setProvince(confirmBo.getProvince()); order.setCity(confirmBo.getCity()); order.setTown(confirmBo.getTown()); - order.setOrderTime(StringUtils.hasText(pddOrder.getCreated())? DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",pddOrder.getCreated()):new Date()); + // 定义日期时间格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + // 将字符串转换为LocalDateTime + LocalDateTime orderTime = LocalDateTime.parse(taoOrder.getCreated(), formatter); + + order.setOrderTime(StringUtils.hasText(taoOrder.getCreated())?orderTime:LocalDateTime.now()); order.setShipper(0l); order.setShipStatus(0); order.setCreateTime(new Date()); @@ -293,7 +300,7 @@ public class TaoOrderServiceImpl extends ServiceImpl oOrderItem.setOrderNum(order.getOrderNum()); oOrderItem.setSubOrderNum(item.getOid().toString()); oOrderItem.setShopType(EnumShopType.TAO.getIndex()); - oOrderItem.setShopId(pddOrder.getShopId()); + oOrderItem.setShopId(taoOrder.getShopId()); oOrderItem.setSkuId(item.getSkuId().toString()); oOrderItem.setGoodsId(StringUtils.hasText(item.getoGoodsId())?Long.parseLong(item.getoGoodsId()):0L); oOrderItem.setGoodsSkuId(StringUtils.hasText(item.getoGoodsSkuId())?Long.parseLong(item.getoGoodsSkuId()):0L); @@ -319,7 +326,7 @@ public class TaoOrderServiceImpl extends ServiceImpl } // 更新自己 TaoOrder douOrderUpdate = new TaoOrder(); - douOrderUpdate.setId(pddOrder.getId()); + douOrderUpdate.setId(taoOrder.getId()); douOrderUpdate.setAuditStatus(1); douOrderUpdate.setAuditTime(new Date()); mapper.updateById(douOrderUpdate); diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java index bd47b251..ffa3918d 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java @@ -28,6 +28,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StringUtils; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.Date; import java.util.List; @@ -161,22 +164,22 @@ public class WeiOrderServiceImpl extends ServiceImpl @Transactional(rollbackFor = Exception.class) @Override public ResultVo confirmOrder(WeiOrderConfirmBo confirmBo) { - WeiOrder pddOrder = mapper.selectById(confirmBo.getOrderId()); - if(pddOrder==null) return ResultVo.error("订单数据不存在"); - if(pddOrder.getAuditStatus()!=0) return ResultVo.error("已经确认过了！"); + WeiOrder weiOrder = mapper.selectById(confirmBo.getOrderId()); + if(weiOrder==null) return ResultVo.error("订单数据不存在"); + if(weiOrder.getAuditStatus()!=0) return ResultVo.error("已经确认过了！"); List pddOrderItems = itemMapper.selectList( new LambdaQueryWrapper() - .eq(WeiOrderItem::getOrderId, pddOrder.getOrderId())); + .eq(WeiOrderItem::getOrderId, weiOrder.getOrderId())); if(pddOrderItems==null || pddOrderItems.isEmpty()){ return ResultVo.error("找不到订单item"); } - OOrder erpOrder = erpOrderMapper.selectOne(new LambdaQueryWrapper().eq(OOrder::getOrderNum,pddOrder.getOrderId())); + OOrder erpOrder = erpOrderMapper.selectOne(new LambdaQueryWrapper().eq(OOrder::getOrderNum,weiOrder.getOrderId())); if(erpOrder!=null) { // 已经确认过了，更新自己 WeiOrder douOrderUpdate = new WeiOrder(); - douOrderUpdate.setId(pddOrder.getId()); + douOrderUpdate.setId(weiOrder.getId()); douOrderUpdate.setAuditStatus(1); douOrderUpdate.setAuditTime(new Date()); mapper.updateById(douOrderUpdate); @@ -184,20 +187,20 @@ public class WeiOrderServiceImpl extends ServiceImpl return ResultVo.error("已经确认过了"); } OOrder order = new OOrder(); - order.setOrderNum(pddOrder.getOrderId()); + order.setOrderNum(weiOrder.getOrderId()); order.setShopType(EnumShopType.WEI.getIndex()); - order.setShopId(pddOrder.getShopId()); + order.setShopId(weiOrder.getShopId()); // order.setShipType(confirmBo.getShipType()); order.setShipType(0); order.setBuyerMemo(""); order.setSellerMemo(""); order.setRefundStatus(1); order.setOrderStatus(1); - order.setGoodsAmount(pddOrder.getProductPrice()!=null?pddOrder.getProductPrice().doubleValue()/100:0.0); - order.setPostFee(pddOrder.getFreight()!=null?pddOrder.getFreight().doubleValue()/100:0.0); - order.setSellerDiscount(pddOrder.getDiscountedPrice()!=null?pddOrder.getDiscountedPrice().doubleValue()/100:0.0); + order.setGoodsAmount(weiOrder.getProductPrice()!=null?weiOrder.getProductPrice().doubleValue()/100:0.0); + order.setPostFee(weiOrder.getFreight()!=null?weiOrder.getFreight().doubleValue()/100:0.0); + order.setSellerDiscount(weiOrder.getDiscountedPrice()!=null?weiOrder.getDiscountedPrice().doubleValue()/100:0.0); order.setPlatformDiscount(0.0); - order.setAmount(pddOrder.getOrderPrice()!=null?pddOrder.getOrderPrice().doubleValue()/100:0.0); + order.setAmount(weiOrder.getOrderPrice()!=null?weiOrder.getOrderPrice().doubleValue()/100:0.0); order.setPayment(order.getAmount()); order.setReceiverName(confirmBo.getReceiver()); order.setReceiverMobile(confirmBo.getMobile()); @@ -205,7 +208,9 @@ public class WeiOrderServiceImpl extends ServiceImpl order.setProvince(confirmBo.getProvince()); order.setCity(confirmBo.getCity()); order.setTown(confirmBo.getTown()); - order.setOrderTime(pddOrder.getCreateTime()!=null?new Date(pddOrder.getCreateTime()*1000):new Date()); + + LocalDateTime orderTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(weiOrder.getCreateTime()), ZoneId.systemDefault()); + order.setOrderTime(weiOrder.getCreateTime()!=null?orderTime:LocalDateTime.now()); order.setShipper(0l); order.setShipStatus(0); order.setCreateTime(new Date()); @@ -218,7 +223,7 @@ public class WeiOrderServiceImpl extends ServiceImpl oOrderItem.setOrderNum(order.getOrderNum()); oOrderItem.setSubOrderNum(order.getOrderNum()+"-"+item.getSkuId()); oOrderItem.setShopType(EnumShopType.WEI.getIndex()); - oOrderItem.setShopId(pddOrder.getShopId()); + oOrderItem.setShopId(weiOrder.getShopId()); oOrderItem.setSkuId(item.getSkuId()); oOrderItem.setGoodsId(item.getOGoodsId()!=null?item.getOGoodsId():0L); oOrderItem.setGoodsSkuId(item.getOGoodsSkuId()!=null?item.getOGoodsSkuId():0L); @@ -244,7 +249,7 @@ public class WeiOrderServiceImpl extends ServiceImpl } // 更新自己 WeiOrder douOrderUpdate = new WeiOrder(); - douOrderUpdate.setId(pddOrder.getId()); + douOrderUpdate.setId(weiOrder.getId()); douOrderUpdate.setAuditStatus(1); douOrderUpdate.setAuditTime(new Date()); mapper.updateById(douOrderUpdate);