From 4222a6e41ad7e2301ba7144a39154c50b2a71d53 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sun, 20 Dec 2020 21:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=BC=80=E5=90=AF=E3=80=82=E5=8F=8A=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=20todo=20=E4=B8=8B=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=98=AF=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=A7=AF=E5=88=86=E3=80=82=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E4=B8=8D=E8=BF=94=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=AE=A1=E7=AE=97=E4=BD=A3=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/services/OrderSupplyService.java  |  4 +++
 .../main/resources/config/application-dev.yml |  2 +-
 .../java/co/yixiang/enums/PayTypeEnum.java    |  3 ++-
 .../main/java/co/yixiang/utils/OrderUtil.java |  3 +++
 .../order/service/YxStoreOrderService.java    |  6 +++++
 .../service/impl/YxStoreOrderServiceImpl.java | 27 +++++++++++++++++++
 .../modules/order/vo/YxStoreOrderQueryVo.java |  3 +++
 .../product/domain/YxStoreProduct.java        |  3 +++
 .../domain/YxStoreProductAttrValue.java       |  4 +++
 .../product/service/dto/ProductDto.java       |  4 +++
 .../product/service/dto/ProductFormatDto.java |  2 ++
 .../product/service/dto/StoreProductDto.java  |  4 +++
 .../impl/YxStoreProductAttrServiceImpl.java   |  1 +
 .../impl/YxStoreProductServiceImpl.java       | 11 ++++++++
 .../product/vo/YxStoreProductQueryVo.java     |  3 +++
 15 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
index c115201a..b8f473a2 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
@@ -240,6 +240,10 @@ public class OrderSupplyService {
                 storeOrderService.yuePay(orderId,uid);
                 map.put("payMsg","余额支付成功");
                 return map;
+            case INTEGRAL:
+                storeOrderService.integralPay(orderId,uid);
+                map.put("payMsg","积分兑换成功");
+                return map;
         }
 
         map.put("payMsg","订单生成失败");
diff --git a/yshop-app/src/main/resources/config/application-dev.yml b/yshop-app/src/main/resources/config/application-dev.yml
index 13395177..89e2b77b 100644
--- a/yshop-app/src/main/resources/config/application-dev.yml
+++ b/yshop-app/src/main/resources/config/application-dev.yml
@@ -7,7 +7,7 @@ spring:
       master:
         url: jdbc:mysql://localhost:3306/yshopb2c?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
         username: root
-        password: root
+        password: 123456
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
diff --git a/yshop-common/src/main/java/co/yixiang/enums/PayTypeEnum.java b/yshop-common/src/main/java/co/yixiang/enums/PayTypeEnum.java
index 4a36bf84..b53f3bdc 100644
--- a/yshop-common/src/main/java/co/yixiang/enums/PayTypeEnum.java
+++ b/yshop-common/src/main/java/co/yixiang/enums/PayTypeEnum.java
@@ -20,7 +20,8 @@ public enum PayTypeEnum {
 
 	ALI("alipay","支付宝支付"),
 	WEIXIN("weixin","微信支付"),
-	YUE("yue","余额支付");
+	YUE("yue","余额支付"),
+	INTEGRAL("integral","积分兑换");
 
 
 	private String value;
diff --git a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java
index aae72b59..b81f6e3a 100644
--- a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java
+++ b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java
@@ -250,6 +250,9 @@ public class OrderUtil {
                 case "yue":
                     payTypeName = "余额支付";
                     break;
+                case "integral":
+                    payTypeName = "积分兑换";
+                    break;
                 case "offline":
                     payTypeName = "线下支付";
                     break;
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
index e44cb1dc..e7fc9009 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
@@ -194,6 +194,12 @@ public interface YxStoreOrderService  extends BaseService<YxStoreOrder>{
      */
     void yuePay(String orderId,Long uid);
 
+    /**
+     * 积分兑换
+     * @param orderId 订单号
+     * @param uid 用户id
+     */
+    void integralPay(String orderId,Long uid);
 
 
     String aliPay(String orderId) throws Exception;
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 23c47980..edd660aa 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
@@ -1572,7 +1572,34 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
     }
 
 
+    /**
+     * 积分兑换
+     * @param orderId 订单号
+     * @param uid 用户id
+     */
+    @Override
+    public void integralPay(String orderId, Long uid) {
+        YxStoreOrderQueryVo orderInfo = getOrderInfo(orderId,uid);
+        if(ObjectUtil.isNull(orderInfo)) {
+            throw new YshopException("订单不存在");
+        }
 
+        if(OrderInfoEnum.PAY_STATUS_1.getValue().equals(orderInfo.getPaid())) {
+            throw new YshopException("该订单已支付");
+        }
+
+        YxUserQueryVo userInfo = userService.getYxUserById(uid);
+
+        if(userInfo.getIntegral().compareTo(orderInfo.getPayIntegral()) < 0){
+            throw new YshopException("积分不足");
+        }
+
+        //扣除积分
+        userService.decIntegral(uid,orderInfo.getPayIntegral().doubleValue());
+
+        //支付成功后处理
+        this.paySuccess(orderInfo.getOrderId(),PayTypeEnum.YUE.getValue());
+    }
 
 
     /**
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
index 4a853043..3539eebd 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
@@ -71,6 +71,9 @@ public class YxStoreOrderQueryVo implements Serializable {
     @ApiModelProperty(value = "实际支付金额")
     private BigDecimal payPrice;
 
+    @ApiModelProperty(value = "实际支付积分")
+    private BigDecimal payIntegral;
+
     @ApiModelProperty(value = "支付邮费")
     private BigDecimal payPostage;
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
index 8897fe6c..76e95e70 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
@@ -232,6 +232,9 @@ public class YxStoreProduct extends BaseDomain {
     @ApiModelProperty(value = "是否单独分佣")
     private Integer isSub;
 
+    @ApiModelProperty(value = "是否开启积分兑换")
+    private Integer isIntegral;
+
     @TableField(exist = false)
     private YxStoreCategory storeCategory;
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java
index 605e004f..423de258 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java
@@ -122,6 +122,10 @@ public class YxStoreProductAttrValue implements Serializable {
     @ApiModelProperty(value = "二级返佣")
     private BigDecimal brokerageTwo;
 
+    /** 所需多少积分兑换商品 */
+    @ApiModelProperty(value = "所需多少积分兑换商品")
+    private Integer integral;
+
 
     public void copy(YxStoreProductAttrValue source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductDto.java
index dd3250ab..e6c823b8 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductDto.java
@@ -122,6 +122,10 @@ public class ProductDto
     @JsonProperty("is_sub")
     private Integer isSub;
 
+    /** 是否开启啊积分兑换 */
+    @JsonProperty("is_integral")
+    private Integer isIntegral;
+
     /** 虚拟销量 */
     private Long ficti;
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java
index 48412544..09662922 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java
@@ -44,6 +44,8 @@ public class ProductFormatDto {
 
     private Integer stock = 0;
 
+    private Integer integral = 0;
+
     private String pic = "";
 
     private String value1 = "";
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/StoreProductDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/StoreProductDto.java
index 6434025e..3e75bb11 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/StoreProductDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/StoreProductDto.java
@@ -125,6 +125,10 @@ public class StoreProductDto
     @JsonProperty("is_sub")
     private Integer isSub;
 
+    /** 是否开启啊积分兑换 */
+    @JsonProperty("is_integral")
+    private Integer isIntegral;
+
     /** 虚拟销量 */
     private Long ficti;
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java
index 26d2a8d0..c7ff9f3c 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java
@@ -112,6 +112,7 @@ public class YxStoreProductAttrServiceImpl extends BaseServiceImpl<StoreProductA
                     .brokerage(BigDecimal.valueOf(productFormatDto.getBrokerage()))
                     .brokerageTwo(BigDecimal.valueOf(productFormatDto.getBrokerageTwo()))
                     .stock(productFormatDto.getStock())
+                    .integral(productFormatDto.getIntegral())
                     .pinkPrice(BigDecimal.valueOf(productFormatDto.getPinkPrice()==null?0:productFormatDto.getPinkPrice()))
                     .seckillPrice(BigDecimal.valueOf(productFormatDto.getSeckillPrice()==null?0:productFormatDto.getSeckillPrice()))
                     .pinkStock(productFormatDto.getPinkStock()==null?0:productFormatDto.getPinkStock())
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
index db1d60e6..cec4b18f 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
@@ -235,6 +235,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(YxStoreProduct::getIsShow, CommonEnum.SHOW_STATUS_1.getValue());
         wrapper.eq(YxStoreProduct::getIsDel, CommonEnum.DEL_STATUS_0.getValue());
+//        wrapper.eq(YxStoreProduct::getIsIntegral, CommonEnum.SHOW_STATUS_1.getValue());
 
         //多字段模糊查询分类搜索
         if (StrUtil.isNotBlank(productQueryParam.getSid()) &&
@@ -411,6 +412,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
 
        LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(YxStoreProduct::getIsShow, ShopCommonEnum.SHOW_1.getValue())
+//                .eq(YxStoreProduct::getIsIntegral,CommonEnum.SHOW_STATUS_1.getValue())
                 .orderByDesc(YxStoreProduct::getSort);
 
         // order
@@ -679,6 +681,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
             valueMap.put("seckill_price", 0);
             valueMap.put("pink_stock", 0);
             valueMap.put("seckill_stock", 0);
+            valueMap.put("integral", 0);
             if (id > 0) {
                 YxStoreProductAttrValue storeProductAttrValue = yxStoreProductAttrValueService
                         .getOne(Wrappers.<YxStoreProductAttrValue>lambdaQuery()
@@ -699,6 +702,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
                     valueMap.put("seckill_price", storeProductAttrValue.getSeckillPrice());
                     valueMap.put("pink_stock", storeProductAttrValue.getPinkStock());
                     valueMap.put("seckill_stock", storeProductAttrValue.getSeckillStock());
+                    valueMap.put("integral", storeProductAttrValue.getIntegral());
                 }
             }
 
@@ -830,6 +834,13 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         headerMap.put("slot", "volume");
         headerMap.put("align", align);
         headerMap.put("minWidth", 140);
+        headerMapList.add(ObjectUtil.clone(headerMap));
+
+        headerMap.put("title", "所需兑换积分");
+        headerMap.put("slot", "integral");
+        headerMap.put("align", align);
+        headerMap.put("minWidth", 140);
+        headerMapList.add(ObjectUtil.clone(headerMap));
 
         if (isActivity) {
             headerMap.put("title", "拼团价");
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
index 319a770f..083e3077 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
@@ -149,5 +149,8 @@ public class YxStoreProductQueryVo implements Serializable {
     @ApiModelProperty(value = "规格 0单 1多 ")
     private Integer specType;
 
+    /** 是否开启积分兑换*/
+    @ApiModelProperty(value = "是否开启积分兑换")
+    private Integer isIntegral;
 
 }