From 89ae3315990dcfd6d45c675902d61aa03402faff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Wed, 17 May 2023 16:39:07 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-17-01-=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/.env.production | 8 +- .../views/productrecord/ProductRecordList.vue | 460 +++++++++--------- .../org/jeecg/common/util/CommonUtils.java | 10 + .../java/org/jeecg/common/util/XJobUtils.java | 2 +- .../service/impl/ZyOrdersServiceImpl.java | 3 +- .../impl/HangerLocationServiceImpl.java | 8 +- .../controller/LargeScreenController.java | 86 +++- .../modules/largeScreen/vo/LargeOrderVo.java | 41 ++ .../service/impl/WorkOrderServiceImpl.java | 3 +- 9 files changed, 379 insertions(+), 242 deletions(-) create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/vo/LargeOrderVo.java diff --git a/ant-design-vue-jeecg/.env.production b/ant-design-vue-jeecg/.env.production index b7aee9ca..e56ab616 100644 --- a/ant-design-vue-jeecg/.env.production +++ b/ant-design-vue-jeecg/.env.production @@ -1,4 +1,4 @@ -NODE_ENV=production -VUE_APP_API_BASE_URL=http://182.92.169.222:10085/jeecg-boot -VUE_APP_CAS_BASE_URL=http://182.92.169.222:10085/jeecg-boot/cas -VUE_APP_ONLINE_BASE_URL=http://182.92.169.222:8012 +NODE_ENV=production +VUE_APP_API_BASE_URL=http://10.100.200.112:10085/jeecg-boot +VUE_APP_CAS_BASE_URL=http://10.100.200.112:10085/jeecg-boot/cas +VUE_APP_ONLINE_BASE_URL=http://10.100.200.112:8012 diff --git a/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue index 47929581..96bd6a92 100644 --- a/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue +++ b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue @@ -1,231 +1,231 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java index 27e5cc9c..4386ce5d 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java @@ -212,4 +212,14 @@ public class CommonUtils { return DB_TYPE; } + + /** 截取后6字符串 */ + public static String getLastSixChars(String str,int num) { + if (!str.isEmpty() && str.length() > num) { + return str.substring(str.length() - num); + } else { + // 字符串为空或长度不足6位，返回原字符串 + return str; + } + } } \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java index 223859e2..c69c28d6 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/XJobUtils.java @@ -30,7 +30,7 @@ public class XJobUtils{ //将时间转为long类型 long start=start_Date.getTime(); //获取30-180秒对应毫秒 - long intervalTime=randInt(s*60,s*60)*1000; + long intervalTime=randInt(s*60,e*60)*1000; //总共花费时长 long timeMillis =start+intervalTime; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java index ce734e63..b1f0a47b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.demo.zyorders.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.jeecg.common.util.CommonUtils; import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice; import org.jeecg.modules.demo.customerinvoice.mapper.CustomerInvoiceMapper; import org.jeecg.modules.demo.customerreceivingaddress.entity.CustomerReceivingAddress; @@ -323,7 +324,7 @@ public class ZyOrdersServiceImpl extends ServiceImpl i // message.setZyplanprocessId(); //消息 String ordersNum = zo.getOrdersNum(); - String code = ordersNum.substring(ordersNum.length() - 6); + String code =CommonUtils.getLastSixChars(ordersNum,6); message.setMessage("您有新的订单，订单尾号:" + code + ",请及时查看！"); zySpeechMessageMapper.insert(message); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java index cc7ba3a7..d33f83be 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java @@ -178,7 +178,7 @@ public class HangerLocationServiceImpl extends ServiceImpl getNewOder() { + + LargeOrderVo vo=new LargeOrderVo(); + //最新订单 + QueryWrapper queryWrapper=new QueryWrapper(); + queryWrapper.eq("ischild",1); + queryWrapper.eq("payment_status",1); + queryWrapper.orderByDesc("order_time"); + List list=zyOrdersService.list(queryWrapper); + //取最新一條數據 + if(list.size()>0) + { + ZyOrders orders_model=list.get(0); + vo.setOrders(orders_model); + //顾客信息-性别只能查询用户表 + SysUser user=sysUserService.getById(orders_model.getUserId()); + vo.setUser(user); + + //测体数据，可能有多条，只能取最新的 + QueryWrapper cmqw=new QueryWrapper(); + cmqw.eq("user_id",orders_model.getUserId()); + cmqw.orderByDesc("create_time"); + List cmList=customerMeasureService.list(cmqw); + CustomerMeasure cmModel=new CustomerMeasure(); + if(cmList.size()>0) + { + cmModel=cmList.get(0); + vo.setCustomerMeasure(cmModel); + } + + //订单商品 + QueryWrapper ogqw=new QueryWrapper(); + ogqw.eq("orders_id",orders_model.getId()); + List ogList=orderGoodsService.list(ogqw); + OrderGoods ogModel= new OrderGoods(); + //订单中找款式 + if(ogList.size()>0) + { + ogModel=ogList.get(0); + String[] picArr=ogModel.getGoodsPicture().split(","); + java.util.ArrayList picList = new ArrayList<>(Arrays.asList(picArr)); + vo.setPictureList(picList); + vo.setOrderGoods(ogModel); + //服装款式-模块 + QueryWrapper smqw=new QueryWrapper(); + smqw.eq("style_id",ogModel.getStyleId()); + List smList=zyStyleModuleService.list(smqw); + List newStyleModuleList =zyStyleModuleService.changeList(smList); + vo.setModuleList(newStyleModuleList); + System.out.println(""); + } + } + return Result.OK(vo); + } + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/vo/LargeOrderVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/vo/LargeOrderVo.java new file mode 100644 index 00000000..1577a917 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/vo/LargeOrderVo.java @@ -0,0 +1,41 @@ +package org.jeecg.modules.largeScreen.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure; +import org.jeecg.modules.demo.ordergoods.entity.OrderGoods; +import org.jeecg.modules.demo.zyorders.entity.ZyOrders; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.zystylemodule.entity.NewStyleModule; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.List; + +@Data +public class LargeOrderVo implements Serializable { + private static final long serialVersionUID = 1L; + + //订单用户 + private SysUser user; + + //订单 + private ZyOrders orders; + + //商品 + private OrderGoods orderGoods; + + //测体 + private CustomerMeasure customerMeasure; + + //模块 + private List moduleList; + + //商品图片 + private List pictureList; + + + + + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java index 03ce94e4..077270eb 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.CommonUtils; import org.jeecg.modules.demo.base.mapper.ZyProcessMapper; import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure; import org.jeecg.modules.demo.customermeasure.mapper.CustomerMeasureMapper; @@ -259,7 +260,7 @@ public class WorkOrderServiceImpl extends ServiceImpl