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/dao/dto/AuditDTO.java | 1
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 78 +++-----------
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 119 +++++++++++++++++------
server/services/src/main/java/com/doumee/dao/business/model/Category.java | 8 +
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 67 +++++++++++++
5 files changed, 181 insertions(+), 92 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Category.java b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
index f5b76db..4ceec4f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -63,7 +64,7 @@
@ApiModelProperty(value = "绫诲瀷:0=鍝佺閰嶇疆锛�1=杞﹁締绫诲瀷閰嶇疆锛�2=椁愭爣閰嶇疆锛�3=鎵嬬画璐归厤缃紱", example = "1")
@ExcelColumn(name="绫诲瀷:0=鍝佺閰嶇疆锛�1=杞﹁締绫诲瀷閰嶇疆锛�2=椁愭爣閰嶇疆锛�3=鎵嬬画璐归厤缃紱")
- private Byte type;
+ private Integer type;
@ApiModelProperty(value = "鍐呭锛堣溅杈嗚鏍笺�侀鏍囥�佹墜缁垂姣斾緥锛�")
@ExcelColumn(name="鍐呭锛堣溅杈嗚鏍笺�侀鏍囥�佹墜缁垂姣斾緥锛�")
@@ -85,5 +86,10 @@
@ApiModelProperty(value = "椁愭爣绛夐厤缃」闆嗗悎", example = "1")
@TableField(exist = false)
private JSONArray detailList;
+ @ApiModelProperty(value = "鍥炬爣鍏ㄨ矾寰�")
+ @TableField(exist = false)
+ private String iconFull;
+ @ApiModelProperty(hidden = true)
+ private LoginUserInfo loginUserInfo;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index 8f294c0..67d9c3f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -26,232 +26,187 @@
public class Orders {
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name = "鍙戝竷鏃堕棿",index = 8,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鍙戝崟鏂�", example = "1")
- @ExcelColumn(name="鍙戝崟鏂�")
private Integer releaseMemberId;
@ApiModelProperty(value = "绫诲瀷:0=鐢ㄥ伐锛�1=杩愯揣锛�2=璁㈤", example = "1")
- @ExcelColumn(name="绫诲瀷:0=鐢ㄥ伐锛�1=杩愯揣锛�2=璁㈤")
+ @ExcelColumn(name = "璁㈠崟绫诲瀷",valueMapping = "0=鐢ㄥ伐鍗�;1=璐ц繍鍗�;2=璁㈤鍗�;",index = 2,width = 10)
private Integer type;
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
- @ExcelColumn(name="寮�濮嬫椂闂� yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
- @ExcelColumn(name="缁撴潫鏃堕棿 yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
- @ExcelColumn(name="鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
private String location;
@ApiModelProperty(value = "鍦扮偣鎻忚堪")
- @ExcelColumn(name="鍦扮偣鎻忚堪")
private String locationRemark;
@ApiModelProperty(value = "缁忓害", example = "1")
- @ExcelColumn(name="缁忓害")
private BigDecimal lat;
@ApiModelProperty(value = "鐪佷唤")
- @ExcelColumn(name="鐪佷唤")
private String province;
@ApiModelProperty(value = "鍩庡競")
- @ExcelColumn(name="鍩庡競")
private String city;
@ApiModelProperty(value = "鍖哄幙")
- @ExcelColumn(name="鍖哄幙")
private String area;
@ApiModelProperty(value = "绾害", example = "1")
- @ExcelColumn(name="绾害")
private BigDecimal lgt;
@ApiModelProperty(value = "闇�姹傜被鍨嬶紙杩愯揣/鐢ㄥ伐)锛氬叧鑱� category", example = "1")
- @ExcelColumn(name="闇�姹傜被鍨嬶紙杩愯揣/鐢ㄥ伐)锛氬叧鑱� category")
private Integer categoryId;
@ApiModelProperty(value = "鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級", example = "1")
- @ExcelColumn(name="鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級")
private Integer workType;
@ApiModelProperty(value = "璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟/灏忔椂/鏂ゆ暟)", example = "1")
- @ExcelColumn(name="璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟/灏忔椂/鏂ゆ暟)")
private Integer priceNum1;
@ApiModelProperty(value = "璁′环鏁伴噺2(浜烘暟/鐢ㄩ浠芥暟)", example = "1")
- @ExcelColumn(name="璁′环鏁伴噺2(浜烘暟/鐢ㄩ浠芥暟)")
private Integer priceNum2;
@ApiModelProperty(value = "闇�姹傝ˉ鍏�")
- @ExcelColumn(name="闇�姹傝ˉ鍏�")
private String supplement;
@ApiModelProperty(value = "璐圭敤鏍囧噯", example = "1")
- @ExcelColumn(name="璐圭敤鏍囧噯")
private Long price;
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
- @ExcelColumn(name="棰勪及璐圭敤")
private Long estimatedAccount;
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
- @ExcelColumn(name="瀹為檯鏀粯璐圭敤")
private Long payAccount;
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
- @ExcelColumn(name="瀹炴敹璐圭敤")
private Long receiveAccount;
-// @ApiModelProperty(value = "璐圭敤璇存槑(寮冪敤)")
-// private String priceRemark;
-
@ApiModelProperty(value = "鐢ㄨ溅绫诲瀷(鐢ㄥ伐鍖呰/杩愯揣浣跨敤):0=澶�;1=娆�/灏忔椂;2=閲嶉噺", example = "1")
- @ExcelColumn(name="鐢ㄨ溅绫诲瀷(鐢ㄥ伐鍖呰/杩愯揣浣跨敤):0=澶�;1=娆�/灏忔椂;2=閲嶉噺")
private Integer carType;
@ApiModelProperty(value = "杩愯緭鍝佺(杩愯揣浣跨敤) 鍏宠仈category琛�", example = "1")
- @ExcelColumn(name="杩愯緭鍝佺(杩愯揣浣跨敤) 鍏宠仈category琛�")
private Integer transportTypeId;
@ApiModelProperty(value = "杩愯緭閲嶉噺/鏁伴噺", example = "1")
- @ExcelColumn(name="杩愯緭閲嶉噺/鏁伴噺")
private Integer transportNum;
@ApiModelProperty(value = "杩愯緭鍗曚綅(涓�/鏂�)")
- @ExcelColumn(name="杩愯緭鍗曚綅(涓�/鏂�)")
private String transportUnit;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣鍦板潃")
- @ExcelColumn(name = "鐢ㄨ溅缁堢偣鍦板潃")
private String locationEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣缁忓害")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣缁忓害")
private String latEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣绾害")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣绾害")
private String lgtEnd;
@ApiModelProperty(value = "閫旂粡鐐�/椁愭爣淇℃伅")
- @ExcelColumn(name="閫旂粡鐐�/椁愭爣淇℃伅")
private String wayInfo;
@ApiModelProperty(value = "璁㈠崟缂栧彿")
- @ExcelColumn(name="璁㈠崟缂栧彿")
+ @ExcelColumn(name = "璁㈠崟缂栧彿",index = 1,width = 10)
private String code;
@ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑堬紱", example = "1")
- @ExcelColumn(name="璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑堬紱")
+ @ExcelColumn(name = "璁㈠崟鐘舵��",index = 11,width = 10,valueMapping = "0=寰呮敮浠�;1=寰呮帴鍗�;2=宸叉帴鍗�;3=杩涜涓�;4=宸插畬鎴�;99=宸插彇娑�;")
private Integer status;
@ApiModelProperty(value = "鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠�", example = "1")
- @ExcelColumn(name="鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠橈紱")
private Integer payStatus;
@ApiModelProperty(value = "鎺ュ崟鏃堕棿")
- @ExcelColumn(name="鎺ュ崟鏃堕棿")
+ @ExcelColumn(name = "鎺ュ崟鏃堕棿",index = 9,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty(value = "鎺ュ崟浜�", example = "1")
- @ExcelColumn(name="鎺ュ崟浜�")
private Integer acceptMemberId;
@ApiModelProperty(value = "鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�", example = "1")
- @ExcelColumn(name="鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�")
private Integer acceptType;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
- @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
private Date workStartTime;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
- @ExcelColumn(name="瀹屾垚鏃堕棿")
+ @ExcelColumn(name = "瀹屾垚鏃堕棿",index = 10,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;
@ApiModelProperty(value = "骞冲彴鎻愭垚姣斾緥", example = "1")
- @ExcelColumn(name="骞冲彴鎻愭垚姣斾緥")
private BigDecimal platformRata;
@ApiModelProperty(value = "寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
- @ExcelColumn(name="寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
private String wxExternalNo;
@ApiModelProperty(value = "鏄惁璇勪环:0=鍚︼紱1=鏄�", example = "1")
- @ExcelColumn(name="鏄惁璇勪环:0=鍚︼紱1=鏄�")
private Integer commentStatus;
@ApiModelProperty(value = "璇勪环鍐呭")
- @ExcelColumn(name="璇勪环鍐呭")
private String commentInfo;
@ApiModelProperty(value = "璇勪环鏄熺骇1-5", example = "1")
- @ExcelColumn(name="璇勪环鏄熺骇1-5")
private Integer commentLevel;
@ApiModelProperty(value = "璇勪环鏃堕棿")
- @ExcelColumn(name="璇勪环鏃堕棿")
private Date commentTime;
@ApiModelProperty(value = "璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�", example = "1")
- @ExcelColumn(name="璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�")
private Integer commentType;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @ExcelColumn(name="鍙栨秷鏃堕棿")
private Date cancelTime;
@ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁�;", example = "1")
- @ExcelColumn(name="鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁わ紱")
private Integer isUpdate;
@ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
- @ExcelColumn(name="鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
private String blackReceive;
@ApiModelProperty(value = "鎬诲ぉ鏁�", example = "1")
- @ExcelColumn(name="鎬诲ぉ鏁�")
private Integer totalDays;
@ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
- @ExcelColumn(name = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
private Integer cancelType;
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
+
+
+ @ApiModelProperty(value = "鏃ュ織鍒楄〃")
+ @TableField(exist = false)
+ private List<OrderLog> orderLogList;
+
+
@ApiModelProperty(value = "閫旂粡鐐�")
@TableField(exist = false)
@@ -284,22 +239,27 @@
@ApiModelProperty(value = "鎺ュ崟鏂瑰悕绉�")
@TableField(exist = false)
+ @ExcelColumn(name = "鎺ュ崟鏂瑰悕绉�",index = 6,width = 10)
private String acceptName;
- @ApiModelProperty(value = "鎺ュ崟鏂硅仈绯绘柟寮�")
+ @ApiModelProperty(value = "鎺ュ崟鏂规墜鏈哄彿")
@TableField(exist = false)
+ @ExcelColumn(name = "鎺ュ崟鏂硅仈绯绘柟寮�",index = 7,width = 10)
private String acceptPhone;
@ApiModelProperty(value = "鍙戝崟鏂瑰悕绉�")
@TableField(exist = false)
+ @ExcelColumn(name = "鍙戝崟鏂瑰悕绉�",index = 4,width = 10)
private String releaseName;
@ApiModelProperty(value = "鍙戝崟鏂规墜鏈哄彿")
@TableField(exist = false)
+ @ExcelColumn(name = "鍙戝崟鏂规墜鏈哄彿",index = 5,width = 10)
private String releasePhone;
@ApiModelProperty(value = "璁㈠崟鍐呭")
@TableField(exist = false)
+ @ExcelColumn(name = "璁㈠崟鍐呭",index = 3,width = 20)
private String orderContent;
diff --git a/server/services/src/main/java/com/doumee/dao/dto/AuditDTO.java b/server/services/src/main/java/com/doumee/dao/dto/AuditDTO.java
index 6223a8f..0e813b1 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/AuditDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/AuditDTO.java
@@ -22,4 +22,5 @@
@ApiModelProperty(value = "瀹℃壒鎻忚堪")
private String auditRemark;
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 1120c1f..2dd7779 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -1,7 +1,12 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONArray;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -21,7 +26,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 鍒嗙被淇℃伅琛⊿ervice瀹炵幇
@@ -34,15 +41,38 @@
@Autowired
private CategoryMapper categoryMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
@Override
public Integer create(Category category) {
+ if(Objects.isNull(category)
+ || Objects.isNull(category.getType())
+ || Objects.isNull(category.getName())
+ || (!Constants.equalsInteger(category.getType(),Constants.ZERO)&& CollectionUtils.isEmpty(category.getDetailList()))
+ || (Constants.equalsInteger(category.getType(),Constants.ONE) && (Objects.isNull(category.getIcon())||Objects.isNull(category.getIsFixed())) )
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = category.getLoginUserInfo();
+ category.setCreateTime(new Date());
+ category.setDeleted(Constants.ZERO);
+ category.setCreateUser(loginUserInfo.getId());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
+ category.setDetail(category.getDetailList().toJSONString());
+ }
+ if(!Constants.equalsInteger(category.getType(),Constants.ONE)){
+ category.setIsFixed(Constants.ZERO);
+ }
categoryMapper.insert(category);
return category.getId();
}
@Override
public void deleteById(Integer id) {
- categoryMapper.deleteById(id);
+ categoryMapper.update(new UpdateWrapper<Category>().lambda().set(Category::getDeleted,Constants.ONE).eq(Category::getId,id));
+
+// categoryMapper.deleteById(id);
}
@Override
@@ -61,6 +91,22 @@
@Override
public void updateById(Category category) {
+ if(Objects.isNull(category)
+ || Objects.isNull(category.getId())
+ || Objects.isNull(category.getType())
+ || Objects.isNull(category.getName())
+ || (!Constants.equalsInteger(category.getType(),Constants.ZERO)&& CollectionUtils.isEmpty(category.getDetailList()))
+ || (Constants.equalsInteger(category.getType(),Constants.ONE) && (Objects.isNull(category.getIcon())||Objects.isNull(category.getIsFixed())) )
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = category.getLoginUserInfo();
+ category.setUpdateTime(new Date());
+ category.setIsFixed(null);
+ category.setUpdateUser(loginUserInfo.getId());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
+ category.setDetail(category.getDetailList().toJSONString());
+ }
categoryMapper.updateById(category);
}
@@ -76,7 +122,19 @@
@Override
public Category findById(Integer id) {
- return categoryMapper.selectById(id);
+ Category category = categoryMapper.selectById(id);
+ if(Objects.isNull(category)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(StringUtils.isNotBlank(category.getDetail())){
+ category.setDetailList(JSONArray.parseArray(category.getDetail()));
+ }
+ if(StringUtils.isNotBlank(category.getIcon())){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
+ category.setIconFull(path + category.getIcon());
+ }
+ return category;
}
@Override
@@ -144,11 +202,16 @@
queryWrapper.orderByAsc(Category::getSortnum);
PageData<Category> result =PageData.from(categoryMapper.selectJoinPage(page, Category.class,queryWrapper));
if(result!=null && result.getRecords()!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
for(Category cate : result.getRecords()){
try {
if(StringUtils.isNotBlank(cate.getDetail())){
cate.setDetailList(JSONArray.parseArray(cate.getDetail()));
}
+ if(StringUtils.isNotBlank(cate.getIcon())){
+ cate.setIconFull(path + cate.getIcon());
+ }
}catch (Exception e){
}
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 d340a5a..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
@@ -357,12 +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
@@ -380,7 +421,7 @@
@Override
public PageData<Orders> findPage(PageWrap<Orders> pageWrap) {
IPage<Orders> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<>();
+ MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<Orders>();
Utils.MP.blankToNull(pageWrap.getModel());
Orders model = pageWrap.getModel();
queryWrapper.selectAll(Orders.class)
@@ -412,33 +453,51 @@
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()) {
- 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.getPriceNum1()+"浜�");
- }else{
-
-
-
-
- }
-
-
-
-
- }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
-
- }else{
-
- }
-
-
+ this.getOrderContent(orders);
}
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()+"浠�");
+ }
+ }
+ }
+ }
+ }
+
+ }
+
+
+
@Override
public long count(Orders orders) {
QueryWrapper<Orders> wrapper = new QueryWrapper<>(orders);
--
Gitblit v1.9.3