cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

订单状态处理

Browse Source
This commit is contained in:
xuwenbo
2021-02-22 17:43:38 +08:00
parent 0bb8893eff
commit a923ca15d7
6 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
View File

@ -6,6 +6,7 @@
package co.yixiang.modules.order.service.dto;
import co.yixiang.modules.user.service.dto.YxUserDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -189,4 +190,8 @@ public class YxStoreOrderDto implements Serializable {
private Integer isRemind;
@ApiModelProperty(value = "实际支付积分")
private BigDecimal payIntegral;
}

4
yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java
View File

@ -8,6 +8,7 @@ package co.yixiang.modules.order.service.dto;
import co.yixiang.annotation.Query;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
@ -67,6 +68,9 @@ public class YxStoreOrderQueryCriteria{
@Query
private Integer shippingType;
@Query(type = Query.Type.GREATER_THAN_NQ)
private BigDecimal payIntegral;
@Query
private Integer storeId;
}

13
yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -2361,11 +2361,11 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType()
,yxStoreOrder.getPaid());
yxStoreOrderDto.setPayTypeName(payTypeName);
//订单类型处理
yxStoreOrderDto.setPinkName(this.orderType(yxStoreOrder.getId()
,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId()
,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(),
yxStoreOrder.getShippingType()));
yxStoreOrder.getShippingType(),yxStoreOrder.getPayIntegral()));
//添加订单状态
List<YxStoreOrderStatus> storeOrderStatuses = orderStatusService.list(new LambdaQueryWrapper<YxStoreOrderStatus>()
@ -2442,11 +2442,11 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType()
,yxStoreOrder.getPaid());
yxStoreOrderDto.setPayTypeName(payTypeName);
//订单类型处理
yxStoreOrderDto.setPinkName(this.orderType(yxStoreOrder.getId()
,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId()
,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(),
yxStoreOrder.getShippingType()));
yxStoreOrder.getShippingType(),yxStoreOrder.getPayIntegral()));
List<YxStoreOrderCartInfo> cartInfos = storeOrderCartInfoService.list(
new LambdaQueryWrapper<YxStoreOrderCartInfo>().eq(YxStoreOrderCartInfo::getOid,yxStoreOrder.getId()));
@ -2479,7 +2479,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
* @return string
*/
private String orderType(Long id,Long pinkId, Long combinationId,Long seckillId,
Long bargainId,Integer shippingType) {
Long bargainId,Integer shippingType,BigDecimal payIntegral) {
String str = "[普通订单]";
if(pinkId > 0 || combinationId > 0){
YxStorePink storePink = storePinkService.getOne(new LambdaQueryWrapper<YxStorePink>()
@ -2508,6 +2508,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
if(OrderInfoEnum.SHIPPIING_TYPE_2.getValue().equals(shippingType)) {
str = "[核销订单]";
}
if(payIntegral.compareTo(new BigDecimal("0.00")) == 1) {
str = "[积分兑换]";
}
return str;
}

2
yshop-mproot/src/main/java/co/yixiang/annotation/Query.java
View File

@ -33,6 +33,8 @@ public @interface Query {
EQUAL
// Dong ZhaoYang 2017/8/7 大于等于
, GREATER_THAN
//大于
, GREATER_THAN_NQ
// Dong ZhaoYang 2017/8/7 小于等于
, LESS_THAN
// Dong ZhaoYang 2017/8/7 中模糊查询

3
yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java
View File

@ -72,6 +72,9 @@ public class QueryHelpPlus {
case GREATER_THAN:
queryWrapper.ge(finalAttributeName, val);
break;
case GREATER_THAN_NQ:
queryWrapper.gt(finalAttributeName, val);
break;
case LESS_THAN:
queryWrapper.le(finalAttributeName, val);
break;

4
yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -54,6 +54,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@ -449,6 +450,9 @@ public class StoreOrderController {
case "5":
criteria.setShippingType(2);
break;
case "6":
criteria.setPayIntegral(new BigDecimal("0.00"));
break;
default:
}
}