From 538b74a65dffadbd143a9e7e4218e0d0d91100fa Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 12 十月 2022 17:56:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 e34ab1a..ef73f95 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.*;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.util.SmsUtil;
import com.dg.core.util.Snowflake;
import org.springframework.stereotype.Service;
@@ -32,6 +33,9 @@
@Resource
private GuideEvolveMapper guideEvolveMapper;
+
+ @Resource
+ SmsUtil smsUtil;
@Override
public int addOrder(GuideRepairOrder guideRepairOrder){
@@ -82,6 +86,7 @@
entity.setFromUserId(guideRepairOrder.getSubmitUserId());
entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
+// smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
guideEvolveMapper.insertConfig(entity);
}
}
@@ -117,6 +122,7 @@
guideRepairOrderImageMapper.insert(guideRepairOrderImage);
}
}
+
int ans= baseMapper.insert(guideRepairOrder);
int i = transactionEventMapper.updateById(transactionEvent);
if (ans>0&&i>0)
@@ -145,8 +151,11 @@
@Override
public int updateConfig(GuideRepairOrder order) {
- SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
- order.setGuideUserPhone(sysUser.getPhonenumber());
+ if ( order.getGuideUserId()!=null&&!order.getGuideUserId().equals(""))
+ {
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
+ order.setGuideUserPhone(sysUser.getPhonenumber());
+ }
return baseMapper.updateConfig(order);
}
@@ -199,5 +208,10 @@
return baseMapper.countListNum(state, ids,time);
}
+ @Override
+ public SysUser getSubmitUser(GuideRepairOrder guideRepairOrder){
+ return sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,guideRepairOrder.getSubmitUserId()));
+ }
+
}
--
Gitblit v1.7.1