From 528c681b62b56aca151beba65a95c2173c903334 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 18:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 451 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 250 insertions(+), 201 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..6ad3885 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.*;
@@ -28,7 +27,9 @@
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 com.wechat.pay.java.service.refund.model.RefundNotification;
import jodd.util.StringUtil;
+import lombok.With;
import nonapi.io.github.classgraph.json.Id;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.checkerframework.checker.units.qual.A;
@@ -39,11 +40,13 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
/**
* 璁㈠崟淇℃伅璁板綍Service瀹炵幇
@@ -78,10 +81,13 @@
private IdentityInfoMapper identityInfoMapper;
@Autowired
- private WxMiniUtilService wxMiniUtilService;
+ private WithdrawalOrdersMapper withdrawalOrdersMapper;
@Autowired
- private RedisTemplate<String, Object> redisTemplate;
+ private WxMiniUtilService wxMiniUtilService;
+
+ @Resource
+ private RedisTemplate<String,Object> redisTemplate;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -102,11 +108,11 @@
}
//鐢ㄩ璁㈠崟
if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
- orders.setStatus(Constants.ZERO);
+ orders.setStatus(Constants.ordersStatus.waitPay.getKey());
//鍞よ捣鏀粯涓氬姟
objects = this.getWxPayResponse(orders,orders.getMember().getOpenid());
}else{
- orders.setStatus(Constants.ONE);
+ orders.setStatus(Constants.ordersStatus.wait.getKey());
}
ordersMapper.insert(orders);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orders.getMultifileList())){
@@ -361,7 +367,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 +431,83 @@
@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.apply(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()+"%' or i.TELEPHONE like '%"+model.getAcceptName()+"%' ) ");
+ IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
+ for (Orders orders:iPage.getRecords()) {
+ this.getOrderContent(orders);
+ orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
}
- 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) {
@@ -568,7 +527,7 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(orders.getStatus(),Constants.ONE)){
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
}
if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -592,7 +551,7 @@
orders.setAcceptType(Constants.ZERO);
orders.setAcceptTime(new Date());
orders.setAcceptMemberId(member.getId());
- orders.setStatus(Constants.TWO);
+ orders.setStatus(Constants.ordersStatus.accept.getKey());
ordersMapper.updateById(orders);
//鏇存柊鎺ュ崟閲�
memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum," (publish_num + 1 )").eq(Member::getId,member.getId()));
@@ -621,7 +580,7 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
}
if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -631,7 +590,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟淇敼寰呯‘璁わ紝鏃犳硶杩涜璇ユ搷浣�");
}
orders.setUpdateTime(new Date());
- orders.setStatus(Constants.THREE);
+ orders.setStatus(Constants.ordersStatus.doing.getKey());
orders.setWorkStartTime(new Date());
ordersMapper.updateById(orders);
@@ -660,7 +619,7 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
}
if(Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
@@ -690,6 +649,7 @@
.set(Orders::getEndDate,updOrderDataDTO.getEndDate())
.set(Orders::getTotalDays,updOrderDataDTO.getTotalDays())
.set(Orders::getIsUpdate,Constants.ONE)
+ .set(Orders::getIsUpdateTime,"now()")
.set(Orders::getUpdateTime,"now()")
.set(Orders::getEstimatedAccount,total)
.eq(Orders::getId,orders.getId())
@@ -735,7 +695,7 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
}
if(!Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
@@ -758,7 +718,7 @@
ordersMapper.update(new UpdateWrapper<Orders>().lambda()
.set(Orders::getIsUpdate,Constants.TWO)
.set(Orders::getUpdateTime,"now()")
- .set(Orders::getStatus,Constants.ONE)
+ .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
.set(Orders::getAcceptMemberId,null)
.set(Orders::getAcceptType,null)
.eq(Orders::getId,orders.getId())
@@ -789,9 +749,9 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!(Constants.equalsInteger(orders.getStatus(),Constants.ONE)
- ||Constants.equalsInteger(orders.getStatus(),Constants.ZERO)
- || Constants.equalsInteger(orders.getStatus(),Constants.TWO))){
+ if(!(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())
+ ||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey())
+ || Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷");
}
if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -806,15 +766,14 @@
withdrawalOrders.setCreateTime(new Date());
withdrawalOrders.setMemberId(orders.getReleaseMemberId());
withdrawalOrders.setAmount(orders.getPayAccount());
- withdrawalOrders.setWxExternalNo("refund_"+orders.getCode());
- withdrawalOrders.setStatus(Constants.ONE);
+ withdrawalOrders.setStatus(Constants.ZERO);
withdrawalOrders.setDoneTime(new Date());
withdrawalOrders.setType(Constants.ONE);
withdrawalOrders.setObjId(orders.getId());
wxMiniUtilService.wxRefund(withdrawalOrders,orders);
}
ordersMapper.update(new UpdateWrapper<Orders>().lambda()
- .set(Orders::getStatus,99)
+ .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
.set(Orders::getUpdateTime,"now()")
.set(Orders::getCancelTime,"now()")
.set(Orders::getCancelType,Constants.ZERO)
@@ -825,7 +784,7 @@
Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode());
Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
.apply(" DATE(cancel_time) = DATE(NOW()) ")
- .eq(Orders::getStatus,99)
+ .eq(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
.eq(Orders::getReleaseMemberId,orders.getReleaseMemberId()));
//鏌ヨ鍙栨秷娆℃暟
if(totalCancelTimes<=cancelTimes){
@@ -852,7 +811,7 @@
wxMiniUtilService.wxRefund(withdrawalOrders,orders);
}
ordersMapper.update(new UpdateWrapper<Orders>().lambda()
- .set(Orders::getStatus,99)
+ .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
.set(Orders::getUpdateTime,"now()")
.set(Orders::getCancelTime,"now()")
.set(Orders::getCancelType,Constants.ONE)
@@ -885,7 +844,7 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷");
}
if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
@@ -909,7 +868,7 @@
}
ordersMapper.update(new UpdateWrapper<Orders>().lambda()
.set(Orders::getUpdateTime,"now()")
- .set(Orders::getStatus,Constants.ONE)
+ .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
.set(Orders::getAcceptMemberId,null)
.set(Orders::getAcceptType,null)
.eq(Orders::getId,orders.getId())
@@ -944,7 +903,7 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(orders.getStatus(),Constants.THREE)){
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷");
}
if(Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
@@ -961,7 +920,7 @@
//鍞よ捣鏀粯涓氬姟
object = this.getWxPayResponse(orders,orders.getMember().getOpenid());
}else{
- orders.setStatus(Constants.FOUR);
+ orders.setStatus(Constants.ordersStatus.done.getKey());
//鏃ュ織瀛樺偍
Constants.OrdersLog ordersLog = Constants.OrdersLog.DONE;
this.saveOrderLog(orders,ordersLog,
@@ -980,8 +939,8 @@
if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!(Constants.equalsInteger(orders.getStatus(),Constants.ONE)||Constants.equalsInteger(orders.getStatus(),Constants.TWO)
- ||Constants.equalsInteger(orders.getStatus(),Constants.THREE))){
+ if(!(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())
+ ||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷");
}
//濡傛灉宸叉敮浠� 鍒欓渶瑕佽繘琛岄��娆�
@@ -1007,7 +966,7 @@
}
ordersMapper.update(new UpdateWrapper<Orders>().lambda()
- .set(Orders::getStatus,99)
+ .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
.set(Orders::getUpdateTime,"now()")
.set(Orders::getCancelTime,"now()")
.set(Orders::getCancelType,Constants.TWO)
@@ -1036,7 +995,7 @@
||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(orders.getStatus(),Constants.FOUR)){
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.done.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇勪环");
}
if(Constants.equalsInteger(orders.getCommentStatus(),Constants.ONE)){
@@ -1085,7 +1044,7 @@
//澶勭悊鏀粯瀹屾垚閫昏緫
ordersMapper.update(new UpdateWrapper<Orders>().lambda()
.set(Orders::getUpdateTime,"now()")
- .set(Orders::getStatus,Constants.ONE)
+ .set(Orders::getStatus,Constants.ordersStatus.wait)
.set(Orders::getPayStatus,Constants.ONE)
.set(Orders::getWxExternalNo,paymentNo)
.eq(Orders::getId,orders.getId())
@@ -1305,21 +1264,111 @@
}
-
-
public synchronized String getNextCode(Integer type){
String prefix = "YG";
if(!Constants.equalsInteger(type,Constants.ZERO)){
- prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
+ prefix = (Constants.equalsInteger(type,Constants.ONE)?"YH-":"DC-");
}
- prefix = DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
- Integer countNum = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
+ prefix = DateUtil.getDate(new Date(),"yyyyMMddHHmmss") +"-";
+
+ Integer countNum = (Integer) redisTemplate.opsForValue().get(Constants.RedisKeys.ORDER_CODE);//RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
countNum = Constants.formatIntegerNum(countNum)+1;
//鏇存柊缂撳瓨
- RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ORDER_CODE,countNum);
String nextIndex =Integer.toString( countNum );
return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
}
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void refundCallback(RefundNotification refundNotification){
+ WithdrawalOrders withdrawalOrders = withdrawalOrdersMapper.selectById(refundNotification.getOutRefundNo());
+ if(Objects.isNull(withdrawalOrders)||!Constants.equalsInteger(withdrawalOrders.getStatus(),Constants.ZERO)){
+ return;
+ }
+ withdrawalOrders.setWxExternalNo(refundNotification.getTransactionId());
+ withdrawalOrders.setUpdateTime(new Date());
+ withdrawalOrders.setDoneTime(withdrawalOrders.getUpdateTime());
+ if (!"SUCCESS".equals(refundNotification.getRefundStatus().name())) {
+ // 濡傛灉閫�娆剧姸鎬佷笉姝ｇ‘锛屼慨鏀归��娆惧崟鐘舵��
+ withdrawalOrders.setStatus(Constants.TWO);
+ }else{
+ withdrawalOrders.setStatus(Constants.ONE);
+ }
+ //鏇存柊閫�娆惧崟鐘舵��
+ withdrawalOrdersMapper.updateById(withdrawalOrders);
+ }
+
+
+
+ //todo 鑷姩娲惧崟
+ public void autoGrabOrders(){
+
+
+ }
+
+ //鑷姩璇勪环 璁㈠崟瀹屾垚7澶╁悗鑷姩璇勪环4鏄�
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void autoComment(){
+ List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
+ .eq(Orders::getStatus,Constants.FOUR).eq(Orders::getCommentStatus,Constants.ZERO)
+ .apply(" DATE_ADD(finish_time, INTERVAL 7 DAY) < now() ")
+ .last("limit 100")
+ );
+
+ for (Orders orders:ordersList) {
+ ordersMapper.update(new UpdateWrapper<Orders>().lambda()
+ .set(Orders::getCommentStatus,Constants.ONE)
+ .set(Orders::getUpdateTime,"now()")
+ .set(Orders::getCommentTime,"now()")
+ .set(Orders::getCommentLevel,Constants.FOUR)
+ .set(Orders::getCommentType,Constants.ZERO)
+ .eq(Orders::getId,orders.getId())
+ );
+
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getScore," ( total_score +" + Constants.FOUR + " ) / (score_order_num + 1 )")
+ .set(Member::getTotalScore," total_score +" + Constants.FOUR)
+ .set(Member::getScoreOrderNum," score_order_num + 1 " ).eq(Member::getId,orders.getAcceptMemberId())
+ );
+
+ //鏃ュ織瀛樺偍
+ Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_COMMENT;
+ this.saveOrderLog(orders,ordersLog,
+ ordersLog.getInfo(),orders.getAcceptMemberId(),null);
+ }
+ }
+
+
+ //鑷姩纭 璁㈠崟淇敼鍚庤嫢鏈鐞� 鏍规嵁閰嶇疆鑷姩澶勭悊
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void autoConfirm(){
+ String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_CONFIRM).getCode();
+ List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
+ .eq(Orders::getStatus,Constants.ordersStatus.accept).eq(Orders::getIsUpdate,Constants.ONE)
+ .apply(" DATE_ADD(IS_UPDATE_TIME, INTERVAL "+autoConfirmTime+" MINUTE) < now() ")
+ .last("limit 100")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ordersList)){
+ for (Orders orders:ordersList) {
+ ordersMapper.update(new UpdateWrapper<Orders>().lambda()
+ .set(Orders::getIsUpdate,Constants.TWO)
+ .set(Orders::getUpdateTime,"now()")
+ .eq(Orders::getId,orders.getId())
+ );
+ //璁板綍鍚屾剰淇敼鐨勬棩蹇�
+ Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_AGREE;
+ this.saveOrderLog(orders,ordersLog,
+ ordersLog.getInfo(),orders.getAcceptMemberId(),null);
+ }
+ }
+ }
+
+
+
+
+
}
--
Gitblit v1.9.3