From 0bb97de818de957546b6e4dd35f2262d26c33f3b Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 22 Feb 2021 17:43:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/dto/YxStoreOrderDto.java  |  5 +++++
 .../service/dto/YxStoreOrderQueryCriteria.java      |  4 ++++
 .../order/service/impl/YxStoreOrderServiceImpl.java | 13 ++++++++-----
 .../src/main/java/co/yixiang/annotation/Query.java  |  2 ++
 .../java/co/yixiang/common/utils/QueryHelpPlus.java |  3 +++
 .../modules/order/rest/StoreOrderController.java    |  4 ++++
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
index df2aec14..b77a58f1 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
@@ -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;
+
+
 }
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java
index 87a503a5..2476dd3d 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java
@@ -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;
 }
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index ba94567a..b17b2dee 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -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;
     }
 
diff --git a/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java b/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java
index a0e6005d..23d091f4 100644
--- a/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java
+++ b/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java
@@ -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 中模糊查询
diff --git a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java
index c96f9953..35a74521 100644
--- a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java
+++ b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java
@@ -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;
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
index 55936277..8abc1abd 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
@@ -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:
             }
         }