From 3940e5ebf6a2fecca5fc75c9e5d8a325c5842681 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期日, 09 十月 2022 14:00:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index 7932979..dc96213 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -6,6 +6,7 @@
import com.dg.core.db.gen.entity.*;
import com.dg.core.db.gen.mapper.GuideRepairOrderImageMapper;
import com.dg.core.db.gen.mapper.GuideRepairOrderMapper;
+import com.dg.core.db.gen.mapper.SysUserMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.util.Snowflake;
@@ -24,6 +25,9 @@
@Resource
private GuideRepairOrderImageMapper guideRepairOrderImageMapper;
+ @Resource
+ private SysUserMapper sysUserMapper;
+
@Override
public int addOrder(GuideRepairOrder guideRepairOrder){
@@ -34,9 +38,12 @@
guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
guideRepairOrder.setState("1");
+ guideRepairOrder.setCreateTime(LocalDateTime.now());
+ guideRepairOrder.setUpdateTime(LocalDateTime.now());
transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()+1);
- String[] images = guideRepairOrder.getImages().split(",");
- for (String image: images) {
+ if (guideRepairOrder.getImages()!=null){
+ String[] images = guideRepairOrder.getImages().split(",");
+ for (String image: images) {
GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
guideRepairOrderImage.setId(Snowflake.getId());
guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
@@ -44,15 +51,18 @@
guideRepairOrderImage.setCreateTime(LocalDateTime.now());
guideRepairOrderImage.setType(1);
guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ }
}
- if (guideRepairOrder.getOrderNum()!=null){
- GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
- guideRepairOrderImage.setId(Snowflake.getId());
- guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
- guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
- guideRepairOrderImage.setCreateTime(LocalDateTime.now());
- guideRepairOrderImage.setType(2);
- guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ if (guideRepairOrder.getVideo()!=null){
+ if (guideRepairOrder.getOrderNum()!=null){
+ GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
+ guideRepairOrderImage.setId(Snowflake.getId());
+ guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
+ guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
+ guideRepairOrderImage.setType(2);
+ guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ }
}
int ans= baseMapper.insert(guideRepairOrder);
int i = transactionEventMapper.updateById(transactionEvent);
@@ -70,6 +80,8 @@
@Override
public int updateConfig(GuideRepairOrder order) {
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
+ order.setGuideUserPhone(sysUser.getPhonenumber());
return baseMapper.updateConfig(order);
}
--
Gitblit v1.7.1