From 7794bf6f3a88a0308de855a6b30cb14118f01b2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 14:54:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 311 +++++++++++++++++++++------------------------------
1 files changed, 130 insertions(+), 181 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 320b2ea..8a3f607 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -14,7 +14,6 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.GeoUtils;
import com.doumee.core.utils.Utils;
-import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.dto.*;
@@ -79,9 +78,6 @@
@Autowired
private WxMiniUtilService wxMiniUtilService;
-
- @Autowired
- private RedisTemplate<String, Object> redisTemplate;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -361,7 +357,53 @@
@Override
public Orders findById(Integer id) {
- return ordersMapper.selectById(id);
+ Orders orders = ordersMapper.selectJoinOne(Orders.class,new MPJLambdaWrapper<Orders>()
+ .selectAll(Orders.class)
+ .select(" m1.name " , Orders::getReleaseName)
+ .select(" m1.telephone " , Orders::getReleasePhone)
+ .select(" case when i.AUTH_TYPE = 0 then i.LINK_NAME else i.COMPANY_NAME end " , Orders::getAcceptName)
+ .select(" i.TELEPHONE " , Orders::getAcceptPhone)
+ .select("c1.name",Orders::getCategoryName)
+ .select("c2.name",Orders::getTransportTypeName)
+ .leftJoin(" category c1 on t.category_id = c1.id ")
+ .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ")
+ .leftJoin("member m1 on t.RELEASE_MEMBER_ID = m1.id ")
+ .leftJoin("member m2 on t.ACCEPT_MEMBER_ID = m2.id ")
+ .leftJoin("identity_info i on m2.id = i.MEMBER_ID and i.TYPE = t.type and i.AUDIT_STATUS = 2 ")
+ .eq(Orders::getDeleted,Constants.ZERO)
+ .eq(Orders::getId,id)
+ .orderByDesc(Orders::getId));
+ if(Objects.isNull(orders)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ //闄勪欢淇℃伅
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORDERS_FILES).getCode();
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ orders.setMultifileList(multifileList);
+ }
+ //璁㈠崟娴佽浆璁板綍
+ List<OrderLog> orderLogList = orderLogMapper.selectList(new QueryWrapper<OrderLog>().lambda()
+ .eq(OrderLog::getDeleted,Constants.ZERO)
+ .eq(OrderLog::getOrderId,orders.getId())
+ .orderByAsc(OrderLog::getCreateTime)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orderLogList)){
+ for (OrderLog orderLog:orderLogList) {
+ if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ZERO)){
+ orderLog.setLogInfo(orderLog.getLogInfo().replace("{userName}",orders.getReleaseName()));
+ }else if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ONE)){
+ orderLog.setLogInfo(orderLog.getLogInfo().replace("{userName}",orders.getAcceptName()));
+ }
+ }
+ orders.setOrderLogList(orderLogList);
+ }
+ return orders;
}
@Override
@@ -379,176 +421,82 @@
@Override
public PageData<Orders> findPage(PageWrap<Orders> pageWrap) {
IPage<Orders> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Orders> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<Orders>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Orders::getId, pageWrap.getModel().getId());
+ Orders model = pageWrap.getModel();
+ queryWrapper.selectAll(Orders.class)
+ .select(" m1.name " , Orders::getReleaseName)
+ .select(" m1.telephone " , Orders::getReleasePhone)
+ .select(" case when i.AUTH_TYPE = 0 then i.LINK_NAME else i.COMPANY_NAME end " , Orders::getAcceptName)
+ .select(" i.TELEPHONE " , Orders::getAcceptPhone)
+ .select("c1.name",Orders::getCategoryName)
+ .select("c2.name",Orders::getTransportTypeName)
+ .leftJoin(" category c1 on t.category_id = c1.id ")
+ .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ")
+ .leftJoin("member m1 on t.RELEASE_MEMBER_ID = m1.id ")
+ .leftJoin("member m2 on t.ACCEPT_MEMBER_ID = m2.id ")
+ .leftJoin("identity_info i on m2.id = i.MEMBER_ID and i.TYPE = t.type and i.AUDIT_STATUS = 2 ")
+ .eq(Orders::getDeleted,Constants.ZERO)
+ .orderByDesc(Orders::getId)
+ ;
+ queryWrapper.ge(Objects.nonNull(model.getCreateTimeStart()),Orders::getCreateTime, Utils.Date.getStart(model.getCreateTimeStart()));
+ queryWrapper.le(Objects.nonNull(model.getCreateTimeEnd()),Orders::getCreateTime, Utils.Date.getEnd(model.getCreateTimeEnd()));
+ queryWrapper.ge(Objects.nonNull(model.getAcceptTimeStart()),Orders::getAcceptTime, Utils.Date.getStart(model.getAcceptTimeStart()));
+ queryWrapper.le(Objects.nonNull(model.getAcceptTimeEnd()),Orders::getAcceptTime, Utils.Date.getEnd(model.getAcceptTimeEnd()));
+ queryWrapper.ge(Objects.nonNull(model.getDoneTimeStart()),Orders::getFinishTime, Utils.Date.getStart(model.getDoneTimeStart()));
+ queryWrapper.le(Objects.nonNull(model.getDoneTimeEnd()),Orders::getFinishTime, Utils.Date.getEnd(model.getDoneTimeEnd()));
+ queryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(model.getCode()),Orders::getCode, model.getCode());
+ queryWrapper.eq(Objects.nonNull(model.getType()),Orders::getType, model.getType());
+ queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus, model.getStatus());
+ queryWrapper.eq(Objects.nonNull(model.getAcceptType()),Orders::getAcceptType, model.getAcceptType());
+ queryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(model.getReleaseName()),"m1.name", model.getReleaseName());
+ queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getAcceptName())," i.LINK_NAME like '%"+model.getAcceptName()+"%' or i.company_name like '%"+model.getAcceptName()+"%' ");
+ IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
+ for (Orders orders:iPage.getRecords()) {
+ this.getOrderContent(orders);
}
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(Orders::getDeleted, pageWrap.getModel().getDeleted());
- }
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(Orders::getCreateUser, pageWrap.getModel().getCreateUser());
- }
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(Orders::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(Orders::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
- }
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(Orders::getUpdateUser, pageWrap.getModel().getUpdateUser());
- }
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(Orders::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(Orders::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Orders::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getReleaseMemberId() != null) {
- queryWrapper.lambda().eq(Orders::getReleaseMemberId, pageWrap.getModel().getReleaseMemberId());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Orders::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getStartDate() != null) {
- queryWrapper.lambda().ge(Orders::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
- queryWrapper.lambda().le(Orders::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getStartDate()));
- }
- if (pageWrap.getModel().getEndDate() != null) {
- queryWrapper.lambda().ge(Orders::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()));
- queryWrapper.lambda().le(Orders::getEndDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
- }
- if (pageWrap.getModel().getLocation() != null) {
- queryWrapper.lambda().eq(Orders::getLocation, pageWrap.getModel().getLocation());
- }
- if (pageWrap.getModel().getLocationRemark() != null) {
- queryWrapper.lambda().eq(Orders::getLocationRemark, pageWrap.getModel().getLocationRemark());
- }
- if (pageWrap.getModel().getLat() != null) {
- queryWrapper.lambda().eq(Orders::getLat, pageWrap.getModel().getLat());
- }
- if (pageWrap.getModel().getProvince() != null) {
- queryWrapper.lambda().eq(Orders::getProvince, pageWrap.getModel().getProvince());
- }
- if (pageWrap.getModel().getCity() != null) {
- queryWrapper.lambda().eq(Orders::getCity, pageWrap.getModel().getCity());
- }
- if (pageWrap.getModel().getArea() != null) {
- queryWrapper.lambda().eq(Orders::getArea, pageWrap.getModel().getArea());
- }
- if (pageWrap.getModel().getLgt() != null) {
- queryWrapper.lambda().eq(Orders::getLgt, pageWrap.getModel().getLgt());
- }
- if (pageWrap.getModel().getCategoryId() != null) {
- queryWrapper.lambda().eq(Orders::getCategoryId, pageWrap.getModel().getCategoryId());
- }
- if (pageWrap.getModel().getWorkType() != null) {
- queryWrapper.lambda().eq(Orders::getWorkType, pageWrap.getModel().getWorkType());
- }
- if (pageWrap.getModel().getPriceNum1() != null) {
- queryWrapper.lambda().eq(Orders::getPriceNum1, pageWrap.getModel().getPriceNum1());
- }
- if (pageWrap.getModel().getPriceNum2() != null) {
- queryWrapper.lambda().eq(Orders::getPriceNum2, pageWrap.getModel().getPriceNum2());
- }
- if (pageWrap.getModel().getSupplement() != null) {
- queryWrapper.lambda().eq(Orders::getSupplement, pageWrap.getModel().getSupplement());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(Orders::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getEstimatedAccount() != null) {
- queryWrapper.lambda().eq(Orders::getEstimatedAccount, pageWrap.getModel().getEstimatedAccount());
- }
- if (pageWrap.getModel().getPayAccount() != null) {
- queryWrapper.lambda().eq(Orders::getPayAccount, pageWrap.getModel().getPayAccount());
- }
- if (pageWrap.getModel().getCarType() != null) {
- queryWrapper.lambda().eq(Orders::getCarType, pageWrap.getModel().getCarType());
- }
- if (pageWrap.getModel().getTransportTypeId() != null) {
- queryWrapper.lambda().eq(Orders::getTransportTypeId, pageWrap.getModel().getTransportTypeId());
- }
- if (pageWrap.getModel().getTransportNum() != null) {
- queryWrapper.lambda().eq(Orders::getTransportNum, pageWrap.getModel().getTransportNum());
- }
- if (pageWrap.getModel().getTransportUnit() != null) {
- queryWrapper.lambda().eq(Orders::getTransportUnit, pageWrap.getModel().getTransportUnit());
- }
- if (pageWrap.getModel().getLocationEnd() != null) {
- queryWrapper.lambda().eq(Orders::getLocationEnd, pageWrap.getModel().getLocationEnd());
- }
- if (pageWrap.getModel().getLatEnd() != null) {
- queryWrapper.lambda().eq(Orders::getLatEnd, pageWrap.getModel().getLatEnd());
- }
- if (pageWrap.getModel().getLgtEnd() != null) {
- queryWrapper.lambda().eq(Orders::getLgtEnd, pageWrap.getModel().getLgtEnd());
- }
- if (pageWrap.getModel().getWayInfo() != null) {
- queryWrapper.lambda().eq(Orders::getWayInfo, pageWrap.getModel().getWayInfo());
- }
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Orders::getCode, pageWrap.getModel().getCode());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Orders::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getAcceptTime() != null) {
- queryWrapper.lambda().ge(Orders::getAcceptTime, Utils.Date.getStart(pageWrap.getModel().getAcceptTime()));
- queryWrapper.lambda().le(Orders::getAcceptTime, Utils.Date.getEnd(pageWrap.getModel().getAcceptTime()));
- }
- if (pageWrap.getModel().getAcceptMemberId() != null) {
- queryWrapper.lambda().eq(Orders::getAcceptMemberId, pageWrap.getModel().getAcceptMemberId());
- }
- if (pageWrap.getModel().getAcceptType() != null) {
- queryWrapper.lambda().eq(Orders::getAcceptType, pageWrap.getModel().getAcceptType());
- }
- if (pageWrap.getModel().getWorkStartTime() != null) {
- queryWrapper.lambda().ge(Orders::getWorkStartTime, Utils.Date.getStart(pageWrap.getModel().getWorkStartTime()));
- queryWrapper.lambda().le(Orders::getWorkStartTime, Utils.Date.getEnd(pageWrap.getModel().getWorkStartTime()));
- }
- if (pageWrap.getModel().getFinishTime() != null) {
- queryWrapper.lambda().ge(Orders::getFinishTime, Utils.Date.getStart(pageWrap.getModel().getFinishTime()));
- queryWrapper.lambda().le(Orders::getFinishTime, Utils.Date.getEnd(pageWrap.getModel().getFinishTime()));
- }
- if (pageWrap.getModel().getPlatformRata() != null) {
- queryWrapper.lambda().eq(Orders::getPlatformRata, pageWrap.getModel().getPlatformRata());
- }
- if (pageWrap.getModel().getWxExternalNo() != null) {
- queryWrapper.lambda().eq(Orders::getWxExternalNo, pageWrap.getModel().getWxExternalNo());
- }
- if (pageWrap.getModel().getCommentStatus() != null) {
- queryWrapper.lambda().eq(Orders::getCommentStatus, pageWrap.getModel().getCommentStatus());
- }
- if (pageWrap.getModel().getCommentInfo() != null) {
- queryWrapper.lambda().eq(Orders::getCommentInfo, pageWrap.getModel().getCommentInfo());
- }
- if (pageWrap.getModel().getCommentLevel() != null) {
- queryWrapper.lambda().eq(Orders::getCommentLevel, pageWrap.getModel().getCommentLevel());
- }
- if (pageWrap.getModel().getCommentTime() != null) {
- queryWrapper.lambda().ge(Orders::getCommentTime, Utils.Date.getStart(pageWrap.getModel().getCommentTime()));
- queryWrapper.lambda().le(Orders::getCommentTime, Utils.Date.getEnd(pageWrap.getModel().getCommentTime()));
- }
- if (pageWrap.getModel().getCommentType() != null) {
- queryWrapper.lambda().eq(Orders::getCommentType, pageWrap.getModel().getCommentType());
- }
- if (pageWrap.getModel().getCancelTime() != null) {
- queryWrapper.lambda().ge(Orders::getCancelTime, Utils.Date.getStart(pageWrap.getModel().getCancelTime()));
- queryWrapper.lambda().le(Orders::getCancelTime, Utils.Date.getEnd(pageWrap.getModel().getCancelTime()));
- }
- if (pageWrap.getModel().getIsUpdate() != null) {
- queryWrapper.lambda().eq(Orders::getIsUpdate, pageWrap.getModel().getIsUpdate());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ return PageData.from(iPage);
+ }
+
+ public void getOrderContent(Orders orders){
+ if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+ orders.setOrderContent(Constants.workType.getName(orders.getWorkType()) +" | " + orders.getCategoryName());
+ if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
+ orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"鏂�");
+ }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
+ orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"浜�");
+ }else{
+ if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)||Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
+ orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"浜�");
+ }else{
+ orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"鏂�");
+ }
+ }
+ }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
+ orders.setOrderContent( orders.getCategoryName() + " | " + orders.getTransportTypeName() +" | " + orders.getTransportNum() +"鏂�");
+ if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
+ orders.setOrderContent(orders.getOrderContent()+" | 鐢ㄨ溅" +orders.getPriceNum2()+"澶�");
+ }else{
+ orders.setOrderContent(orders.getOrderContent()+" | 鐢ㄨ溅" +orders.getPriceNum2()+"娆�");
+ }
+ }else{
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getWayInfo())){
+ List<CateringDTO> cateringDTOList = JSONArray.parseArray(orders.getWayInfo(),CateringDTO.class);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cateringDTOList)){
+ for (CateringDTO cateringDTO:cateringDTOList) {
+ if(StringUtils.isEmpty(orders.getOrderContent())){
+ orders.setOrderContent(cateringDTO.getName()+cateringDTO.getPrice()+" 闇�"+cateringDTO.getNum()+"浠�");
+ }else{
+ orders.setOrderContent(orders.getOrderContent()+" | "+cateringDTO.getName()+cateringDTO.getPrice()+" 闇�"+cateringDTO.getNum()+"浠�");
+ }
+ }
+ }
}
}
- return PageData.from(ordersMapper.selectPage(page, queryWrapper));
+
}
+
+
@Override
public long count(Orders orders) {
@@ -1308,17 +1256,18 @@
public synchronized String getNextCode(Integer type){
- String prefix = "YG";
- if(!Constants.equalsInteger(type,Constants.ZERO)){
- prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
- }
- prefix = DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
- Integer countNum = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
- countNum = Constants.formatIntegerNum(countNum)+1;
- //鏇存柊缂撳瓨
- RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
- String nextIndex =Integer.toString( countNum );
- return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
+// String prefix = "YG";
+// if(!Constants.equalsInteger(type,Constants.ZERO)){
+// prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
+// }
+// prefix = DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
+// Integer countNum = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
+// countNum = Constants.formatIntegerNum(countNum)+1;
+// //鏇存柊缂撳瓨
+// RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
+// String nextIndex =Integer.toString( countNum );
+// return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
+ return null;
}
--
Gitblit v1.9.3