From d0e9bda3ccb554481bcd52d3c9e22a39ef36abc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 14:44:22 +0800
Subject: [PATCH] 前端
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 415 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 247 insertions(+), 168 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 50586b7..d340a5a 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
@@ -12,6 +12,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.GeoUtils;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
@@ -21,14 +22,17 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Amount;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Payer;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayRequest;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayWithRequestPaymentResponse;
import jodd.util.StringUtil;
+import nonapi.io.github.classgraph.json.Id;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -70,6 +74,9 @@
private MemberRevenueMapper memberRevenueMapper;
@Autowired
+ private IdentityInfoMapper identityInfoMapper;
+
+ @Autowired
private WxMiniUtilService wxMiniUtilService;
@Override
@@ -79,8 +86,8 @@
this.initVerification(orders);
orders.setCreateTime(new Date());
orders.setPayStatus(Constants.ZERO);
- //TODO 璁㈠崟缂栧彿瑙勫垯
-
+ //璁㈠崟缂栧彿
+ orders.setCode(this.getNextCode(orders.getType()));
Category category = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
.eq(Category::getDeleted,Constants.ZERO).eq(Category::getType,Constants.THREE)
.eq(Category::getName,orders.getType())
@@ -350,6 +357,11 @@
@Override
public Orders findById(Integer id) {
+
+
+
+
+
return ordersMapper.selectById(id);
}
@@ -368,175 +380,63 @@
@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<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Orders::getId, pageWrap.getModel().getId());
- }
- 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());
+ 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()) {
+ 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{
+
}
+
+
}
- return PageData.from(ordersMapper.selectPage(page, queryWrapper));
+ return PageData.from(iPage);
}
@Override
@@ -1133,4 +1033,183 @@
return ("澶勭悊鎴愬姛!");
}
+
+ @Override
+ public PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap) {
+ IPage<Orders> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ Orders model = pageWrap.getModel();
+ queryWrapper.selectAll(Orders.class)
+ .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 ");
+ if(Objects.nonNull(model.getQueryMyOrderType())){
+ if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)){
+ //鍙戝崟鏂� 鎴戠殑璁㈠崟
+ queryWrapper.eq(Orders::getReleaseMemberId,model.getMember().getId());
+ }else if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){
+ //鎺ュ崟鏂� 鎴戠殑璁㈠崟
+ queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId());
+ }else{
+ //鎺ュ崟澶у巺
+ queryWrapper.and(i->
+ i.eq(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO),Orders::getType,Constants.ZERO)
+ .or()
+ .eq(Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO),Orders::getType,Constants.ONE)
+ .or()
+ .eq(Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO),Orders::getType,Constants.TWO)
+ );
+ queryWrapper.eq(Orders::getStatus,Constants.ONE);
+ }
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
+ if(Objects.nonNull(model.getQueryMyOrderType())&&Constants.equalsInteger(model.getQueryMyOrderType(),Constants.TWO)){
+ if(Constants.equalsInteger(model.getMember().getUseIdentity(),Constants.ONE)){
+ model.getMember().setWorkerIdentityModel(
+ identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,model.getMember().getId())
+ .eq(IdentityInfo::getType,Constants.ZERO)
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ )
+ );
+ model.getMember().setDriverIdentityModel(
+ identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,model.getMember().getId())
+ .eq(IdentityInfo::getType,Constants.ONE)
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ )
+ );
+ model.getMember().setChefIdentityModel(
+ identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,model.getMember().getId())
+ .eq(IdentityInfo::getType,Constants.TWO)
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ )
+ );
+ }
+ for (Orders orders:iPage.getRecords()) {
+ this.getDistance(model.getMember(),orders);
+ }
+ }
+ return PageData.from(iPage);
+ }
+
+
+
+
+ //瀹氫綅璺濈
+ public void getDistance(Member member,Orders orders){
+
+ if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+ if(Objects.nonNull(member.getWorkerIdentityModel())&&Objects.nonNull(member.getWorkerIdentityModel().getLgt())
+ &&Objects.nonNull(member.getWorkerIdentityModel().getLat())){
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
+ member.getWorkerIdentityModel().getLgt().doubleValue(),
+ member.getWorkerIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
+
+ }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
+ if(Objects.nonNull(member.getDriverIdentityModel())&&Objects.nonNull(member.getDriverIdentityModel().getLgt())
+ &&Objects.nonNull(member.getDriverIdentityModel().getLat())) {
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
+ member.getDriverIdentityModel().getLgt().doubleValue(),
+ member.getDriverIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
+ }else{
+ if(Objects.nonNull(member.getChefIdentityModel())&&Objects.nonNull(member.getChefIdentityModel().getLgt())
+ &&Objects.nonNull(member.getChefIdentityModel().getLat())) {
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
+ member.getChefIdentityModel().getLgt().doubleValue(),
+ member.getChefIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
+ }
+ }
+
+
+
+ @Override
+ public Orders getDetail(Integer id,Integer userType) {
+ Orders orders = ordersMapper.selectJoinOne(Orders.class,new MPJLambdaWrapper<Orders>()
+ .selectAll(Orders.class)
+ .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 ")
+ .eq(Orders::getId,id)
+ );
+ if(Objects.isNull(orders)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Objects.nonNull(userType)){
+ Member member = memberMapper.selectById(
+ Constants.equalsInteger(userType,Constants.ZERO)?orders.getReleaseMemberId():orders.getAcceptMemberId()
+ );
+ if(Objects.nonNull(member)){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getCoverImage())){
+ //澶村儚淇℃伅
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
+ member.setFullCoverImage(path + member.getCoverImage());
+ }
+ orders.setMember(member);
+ }
+ }
+ 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);
+ }
+
+
+ return orders;
+ }
+
+
+
+
+ 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");
+ return null;
+ }
+
+
}
--
Gitblit v1.9.3