From a467f4d32f7ea363a54f18723a0ce994ac949389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Mon, 21 Dec 2020 16:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/3.1升级3.2sql.sql                                       | 1 +
 .../java/co/yixiang/modules/order/domain/YxStoreOrder.java  | 3 +++
 .../modules/order/service/impl/YxStoreOrderServiceImpl.java | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sql/3.1升级3.2sql.sql b/sql/3.1升级3.2sql.sql
index 09cfddc2..489bef6d 100644
--- a/sql/3.1升级3.2sql.sql
+++ b/sql/3.1升级3.2sql.sql
@@ -6,5 +6,6 @@
 ALTER TABLE yx_store_product ADD COLUMN is_integral  tinyint(1)   ZEROFILL NULL DEFAULT 0 COMMENT '是开启积分兑换' AFTER is_del;
 ALTER TABLE yx_store_product_attr_value ADD COLUMN integral INT(10)  DEFAULT 0 COMMENT '需要多少积分兑换' AFTER seckill_price;
 
+ALTER TABLE  yx_store_order ADD COLUMN `pay_integral` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '支付积分';
 
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java b/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java
index 4477eb16..fe374b11 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java
@@ -11,6 +11,7 @@ import co.yixiang.domain.BaseDomain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -236,6 +237,8 @@ public class YxStoreOrder extends BaseDomain {
 
     private Integer isSystemDel;
 
+    @ApiModelProperty(value = "实际支付积分")
+    private BigDecimal payIntegral;
 
     public void copy(YxStoreOrder source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
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 edd660aa..d6900385 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
@@ -1442,8 +1442,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
 
         if(PayTypeEnum.WEIXIN.getValue().equals(order.getPayType())){
             statusDTO.set_payType("微信支付");
-        }else{
+        }else if(PayTypeEnum.YUE.getValue().equals(order.getPayType())){
             statusDTO.set_payType("余额支付");
+        }else{
+            statusDTO.set_payType("积分兑换");
         }
 
         order.set_status(statusDTO);
@@ -1598,7 +1600,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         userService.decIntegral(uid,orderInfo.getPayIntegral().doubleValue());
 
         //支付成功后处理
-        this.paySuccess(orderInfo.getOrderId(),PayTypeEnum.YUE.getValue());
+        this.paySuccess(orderInfo.getOrderId(),PayTypeEnum.INTEGRAL.getValue());
     }