From 763e24b4e06b9bdc2892a79e0ca34b0588694f3e Mon Sep 17 00:00:00 2001 From: yc13649764453 <1902434166@qq.com> Date: Mon, 29 May 2023 14:21:28 +0800 Subject: [PATCH] =?UTF-8?q?----=E5=BF=AB=E9=80=92=E9=B8=9F=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E9=9D=A2=E5=8D=95=E5=8F=91=E8=B4=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuyOrderServiceImpl.java | 117 ++++++++++++++---- 1 file changed, 96 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 444e3dc6..f72d9ece 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -1,20 +1,22 @@ package com.peanut.modules.book.service.impl; +import com.alibaba.druid.mock.MockConnection; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.databind.ObjectMapper; import com.peanut.common.Interface.KdApiEOrder; -import com.peanut.common.utils.HttpClientUtils; +import com.peanut.common.utils.ExcludeEmptyQueryWrapper; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.Query; -import com.peanut.modules.book.dao.*; +import com.peanut.common.utils.R; +import com.peanut.modules.book.dao.BuyOrderDao; +import com.peanut.modules.book.dao.BuyOrderDetailDao; import com.peanut.modules.book.entity.*; import com.peanut.modules.book.service.*; import com.peanut.modules.book.vo.ProductVo; @@ -26,6 +28,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.xml.soap.Text; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -47,20 +53,35 @@ public class BuyOrderServiceImpl extends ServiceImpl params) { + public PageUtils queryPage(Map params) throws Exception{ IPage page = null; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String startTime = null; + String endTime = null; + if(params.containsKey("startTime")){ + startTime = sdf.format(Long.parseLong(params.get("startTime").toString())); + endTime = sdf.format(Long.parseLong(params.get("endTime").toString())); + } if (ObjectUtils.isEmpty(params.get("orderStatus"))) { page = this.page( new Query().getPage(params), - new QueryWrapper() + new ExcludeEmptyQueryWrapper().eq("user_phone",params.get("key")). + or().like("order_sn",params.get("key")).or().like("shipping_user",params.get("key")) + .apply(startTime != null ,"date_format (create_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')",startTime) + .apply(endTime != null,"date_format (create_time,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endTime).orderByDesc("create_time") + ); } else { page = this.page( new Query().getPage(params), - new QueryWrapper().eq("order_status", params.get("orderStatus")) + new ExcludeEmptyQueryWrapper().eq("order_status", params.get("orderStatus")).eq("user_phone",params.get("key")) + .or().like("order_sn",params.get("key")).or().like("shipping_user",params.get("key")) + .apply(startTime != null ,"date_format (create_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')",startTime) + .apply(endTime != null,"date_format (create_time,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endTime).orderByDesc("create_time") ); } @@ -69,9 +90,12 @@ public class BuyOrderServiceImpl extends ServiceImpl() - .eq("order_id", record.getOrderId()))); + if(!ObjectUtils.isEmpty(myUserEntity)){ + record.setUserName(myUserEntity.getName()); + record.setProducts(buyOrderDetailService.list(new QueryWrapper() + .eq("order_id", record.getOrderId()))); + } + } @@ -271,6 +295,23 @@ public class BuyOrderServiceImpl extends ServiceImpl fmsOrderDetailList = this.fmsOrderDetailService.list(new QueryWrapper().eq("order_code", orderCode)); - String SortingCode = jsonObj.getString("SortingCode"); + System.out.println("############################################开始进入判断4444444jsonArr!:"+ jsonArr+"json="+json+"orderCode="+orderCode); + String SortingCode = jsonObj.getString("LogisticCode"); + String ShipperCode=jsonObj.getString("ShipperCode"); + String PrintTemplate=json.getString("PrintTemplate"); for(FMSOrderDetailEntity fms : fmsOrderDetailList){ BuyOrderEntity o = this.getById(fms.getOrderId()); BuyOrderDetailEntity detail = this.buyOrderDetailService.getById(fms.getDetailId()); detail.setOrderStatus("1"); - detail.setFmsHtml(json.getString("PrintTemplate")); + detail.setFmsHtml(PrintTemplate); detail.setCreatTime(new Date()); - detail.setShippingSn(SortingCode.substring(0,SortingCode.indexOf("/"))); - detail.setShipperCode(jsonObj.getString("ShipperCode")); + detail.setShippingSn(SortingCode); + detail.setShipperCode(ShipperCode); detail.setShipperName(shipperName); detail.setIsPrint("0"); - this.buyOrderDetailService.updateById(detail); - List list = this.buyOrderDetailService.list(new QueryWrapper().eq("order_id", fms.getOrderId()).eq("order_status", "0")); +// this.buyOrderDetailService.updateById(detail); + this.buyOrderDetailService.saveOrUpdate(detail); + List list = this.buyOrderDetailService.list(new QueryWrapper().eq("order_id", fms.getOrderId()) + .eq("order_status", "0")); + // .eq("order_status", "0") if(list.size() == 0){ o.setIsSend("1"); o.setOrderStatus("2"); @@ -493,6 +538,7 @@ public class BuyOrderServiceImpl extends ServiceImpl