From b4a195f07fc3c0c417d9bb2f06acf76f5a62f29e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 29 五月 2021 16:33:06 +0800
Subject: [PATCH] 会员权益

---
 service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java |   50 +++++++++++++++++++++++---------------------------
 1 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java b/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java
index 38fa184..2dee4f3 100644
--- a/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java
+++ b/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java
@@ -10,11 +10,9 @@
 import com.ks.vip.pojo.DTO.VipOrderDTO;
 import com.ks.vip.pojo.Enums.OrderTypeEnum;
 import com.ks.vip.pojo.Enums.PayWayEnum;
-import com.ks.vip.query.VipOrderQuery;
 import com.ks.vip.service.VipCenterService;
 import com.ks.vip.service.VipComboService;
 import com.ks.vip.service.VipOrederPayService;
-import com.ks.vip.service.VipOrederService;
 import com.ks.vip.service.manager.RedisManager;
 import com.ks.vip.util.Constant;
 import com.ks.vip.util.PayUtil;
@@ -26,10 +24,7 @@
 import org.yeshi.utils.wx.WXPayV3Util;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 
 @Service(version = "1.0")
@@ -51,16 +46,16 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public PayWayInfoDTO addOrderByBuy(VipOrderDTO t) throws VipOrderException {
-        if(t.getComboId() == null || t.getComboId() <= 0){
+        if (t.getComboId() == null || t.getComboId() <= 0) {
             throw new VipOrderException(1, "濂楅ID涓嶈兘涓虹┖");
         }
-        if(StringUtil.isNullOrEmpty(t.getUid())){
+        if (StringUtil.isNullOrEmpty(t.getUid())) {
             throw new VipOrderException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
         }
-        if(t.getPayWay() == null){
+        if (t.getPayWay() == null) {
             throw new VipOrderException(1, "浠樻鏂瑰紡涓嶈兘涓虹┖");
         }
-        if(StringUtil.isNullOrEmpty(t.getThreeOrderId())){
+        if (StringUtil.isNullOrEmpty(t.getThreeOrderId())) {
             throw new VipOrderException(1, "浠樻璁㈠崟鍙蜂笉鑳戒负绌�");
         }
 
@@ -71,10 +66,10 @@
         }
 
         // 鍒ゆ柇璁㈠崟绫诲瀷: 棣栧崟銆佺画璐�
-        String orderType = OrderTypeEnum.buyNewly.name();
+        OrderTypeEnum orderType = OrderTypeEnum.buyNewly;
         long count = vipOrderMapper.countByTypeAndUid(t.getUid(), orderType);
-        if(count > 0) {
-            orderType = OrderTypeEnum.buyRenew.name();
+        if (count > 0) {
+            orderType = OrderTypeEnum.buyRenew;
         }
 
         // 鎻掑叆璁㈠崟淇℃伅
@@ -114,7 +109,7 @@
                         return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), PayUtil.getPaySuccessUrl(orderId));
                     }
 
-                    String formWX = PayUtil.createWXOrder(orderId, null, orderId, order.getPayMoney() ,goodsTitle);
+                    String formWX = PayUtil.createWXOrder(orderId, null, orderId, order.getPayMoney(), goodsTitle);
                     //鏆傚瓨2鍒嗛挓
                     String idWX = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
                     redisManager.cacheCommonString(formWX, formWX, 120);
@@ -139,7 +134,7 @@
             case "alipay":  //鏀粯瀹�
                 AlipayTradeQueryResponse res = null;
                 try {
-                    res = AlipayH5PayUtil.queryOrder(PayUtil.getAlipayApp(), id+"" , null);
+                    res = AlipayH5PayUtil.queryOrder(PayUtil.getAlipayApp(), id + "", null);
                     //鏀粯鎴愬姛
                     if (res.isSuccess() && "TRADE_SUCCESS".equalsIgnoreCase(res.getTradeStatus())) {
                         try {
@@ -153,7 +148,7 @@
                 }
             case "weChat": //寰俊
                 try {
-                    WXPayOrderInfoV3 info = WXPayV3Util.getPayOrderInfo(id+"" , PayUtil.getWXAPP());
+                    WXPayOrderInfoV3 info = WXPayV3Util.getPayOrderInfo(id + "", PayUtil.getWXAPP());
                     if (info != null && info.getTrade_state().equalsIgnoreCase("SUCCESS")) {
                         paySuccess(order);
                         return order;
@@ -163,11 +158,12 @@
                 }
         }
         return null;
-     }
+    }
 
 
     /**
      * 鏀粯鎴愬姛鏇存柊澶勭悊
+     *
      * @param order
      * @return
      */
@@ -182,22 +178,22 @@
         Integer validDays = vipCombo.getValidDays();
 
         // 鍒ゆ柇璁㈠崟绫诲瀷
-        String orderType = OrderTypeEnum.buyNewly.name();
+        OrderTypeEnum orderType = OrderTypeEnum.buyNewly;
         long count = vipOrderMapper.countByTypeAndUid(order.getUid(), orderType);
-        if(count > 0) {
-            orderType = OrderTypeEnum.buyRenew.name();
+        if (count > 0) {
+            orderType = OrderTypeEnum.buyRenew;
         }
 
         // order.setThreeOrderId(); TODO
-         order.setState(VipOrder.STATE_PAY);
-         order.setPayTime(new Date());
-         order.setUpdateTime(new Date());
-         vipOrderMapper.updateByPrimaryKeySelective(order);
+        order.setState(VipOrder.STATE_PAY);
+        order.setPayTime(new Date());
+        order.setUpdateTime(new Date());
+        vipOrderMapper.updateByPrimaryKeySelective(order);
 
-         // 鏇存柊绛夌骇
-         vipCenterService.saveVipCenter(order.getUid(), vipCombo.getGradeId(), validDays, order.getId() );
+        // 鏇存柊绛夌骇
+        vipCenterService.saveVipCenter(order.getUid(), vipCombo.getGradeId(), validDays * 24, order.getId());
 
-         return order;
-     }
+        return order;
+    }
 
 }

--
Gitblit v1.8.0