From eb7f3343af839a7c71f16e8ada2b25d5e2201c08 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 四月 2021 19:27:52 +0800
Subject: [PATCH] bug修复
---
src/test/java/com/hxh/spring/test/vip/VIPTest.java | 120 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 31 deletions(-)
diff --git a/src/test/java/com/hxh/spring/test/vip/VIPTest.java b/src/test/java/com/hxh/spring/test/vip/VIPTest.java
index 8f1dcde..e496ac2 100644
--- a/src/test/java/com/hxh/spring/test/vip/VIPTest.java
+++ b/src/test/java/com/hxh/spring/test/vip/VIPTest.java
@@ -1,11 +1,17 @@
package com.hxh.spring.test.vip;
-import com.yeshi.buwan.domain.vip.VIPOrderRecord;
+import com.yeshi.buwan.domain.vip.UserVIPInfo;
+import com.yeshi.buwan.domain.vip.OrderRecord;
import com.yeshi.buwan.domain.vip.VIPPrice;
import com.yeshi.buwan.domain.vip.VIPPriceType;
+import com.yeshi.buwan.exception.order.OrderException;
import com.yeshi.buwan.exception.vip.VIPException;
+import com.yeshi.buwan.job.OrderJob;
+import com.yeshi.buwan.pptv.PPTVVipManager;
+import com.yeshi.buwan.service.inter.order.OrderService;
import com.yeshi.buwan.service.inter.vip.VIPPriceService;
import com.yeshi.buwan.service.inter.vip.VIPService;
+import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.util.HttpUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -18,9 +24,9 @@
import java.util.Date;
import java.util.List;
-//@RunWith(SpringJUnit4ClassRunner.class) //浣跨敤junit4杩涜娴嬭瘯
-//@ContextConfiguration(locations = {"classpath:spring.xml"})
-//@WebAppConfiguration
+@RunWith(SpringJUnit4ClassRunner.class) //浣跨敤junit4杩涜娴嬭瘯
+@ContextConfiguration(locations = {"classpath:spring.xml"})
+@WebAppConfiguration
public class VIPTest {
@Resource
@@ -29,9 +35,20 @@
@Resource
private VIPService vipService;
+
+ @Resource
+ private OrderService orderService;
+
+ @Resource
+ private PPTVVipManager pptvVipManager;
+
+ @Resource
+ private OrderJob orderJob;
+
@Test
public void addVIPPrice() {
VIPPrice price = new VIPPrice();
+ price.setActualPrice(new BigDecimal("8.8"));
price.setPrice(new BigDecimal("14.8"));
price.setType(VIPPriceType.month);
price.setPptvGoodsNo("DA7559531560894");
@@ -43,6 +60,7 @@
}
price = new VIPPrice();
+ price.setActualPrice(new BigDecimal("22.8"));
price.setPrice(new BigDecimal("37.8"));
price.setType(VIPPriceType.season);
price.setPptvGoodsNo("DA7559574625089");
@@ -55,6 +73,7 @@
price = new VIPPrice();
+ price.setActualPrice(new BigDecimal("42"));
price.setPrice(new BigDecimal("68.8"));
price.setType(VIPPriceType.halfYear);
price.setPptvGoodsNo("DA6989580247516");
@@ -67,6 +86,7 @@
price = new VIPPrice();
+ price.setActualPrice(new BigDecimal("77.8"));
price.setPrice(new BigDecimal("128.8"));
price.setType(VIPPriceType.year);
price.setPptvGoodsNo("DA8129574268091");
@@ -89,58 +109,96 @@
@Test
public void addOrderRecord() {
VIPPrice price = vipPriceService.selectByPrimaryKey("172a8327fcd3685ab3c0f740d031da09");
- VIPOrderRecord record = new VIPOrderRecord();
- record.setMoney(price.getPrice());
+ OrderRecord record = new OrderRecord();
+ record.setMoney(price.getActualPrice());
record.setType(price.getType());
record.setUid(766693 + "");
try {
- vipService.addVIPRecord(record);
- } catch (VIPException e) {
+ orderService.createOrder(record);
+ } catch (OrderException e) {
e.printStackTrace();
}
}
@Test
public void listRecord() {
- List<VIPOrderRecord> list = vipService.listOrderRecord(null, null, 1, 10);
- long count = vipService.countOrderRecord(null, null);
+ List<OrderRecord> list = orderService.listOrderRecord(null, null,null, 1, 10);
+ long count = orderService.countOrderRecord(null, null,null);
- list = vipService.listOrderRecord(766693 + "", null, 1, 10);
- count = vipService.countOrderRecord(766693 + "", null);
+ list = orderService.listOrderRecord(766693 + "", null,null, 1, 10);
+ count = orderService.countOrderRecord(766693 + "", null,null);
- list = vipService.listOrderRecord(766693 + "", VIPOrderRecord.STATE_NOT_PAY, 1, 10);
- count = vipService.countOrderRecord(766693 + "", VIPOrderRecord.STATE_NOT_PAY);
+ list = orderService.listOrderRecord(766693 + "", null,OrderRecord.STATE_NOT_PAY, 1, 10);
+ count = orderService.countOrderRecord(766693 + "", null,OrderRecord.STATE_NOT_PAY);
- list = vipService.listOrderRecord(766693 + "", VIPOrderRecord.STATE_PAY, 1, 10);
- count = vipService.countOrderRecord(766693 + "", VIPOrderRecord.STATE_PAY);
+ list = orderService.listOrderRecord(766693 + "", null,OrderRecord.STATE_PAY, 1, 10);
+ count = orderService.countOrderRecord(766693 + "",null, OrderRecord.STATE_PAY);
System.out.println(list);
}
@Test
public void paySuccess() {
+// try {
+// vipService.paySuccess("",OrderRecord.PAY_WAY_WX,new BigDecimal("14.8"),)
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+ }
+
+ public static void main(String[] args) {
+ for (int i = 0; i < 10; i++) {
+ final int p = i;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ HttpUtil.get("http://192.168.3.122:8080/BuWan/test/vipPay?id=36");
+ System.out.println("鎵ц瀹屾垚锛�" + p);
+ }
+ }).start();
+ }
+ }
+
+
+ @Test
+ public void list() {
+ Boolean vip = true;
+ Date minDate = null;
+ Date maxDate = null;
+ if (vip != null) {
+ if (vip) {
+ minDate = new Date(System.currentTimeMillis() + 1000 * 60 * 5);
+ } else {
+ minDate = new Date(0L);
+ maxDate = new Date();
+ }
+ }
+
+ List<UserVIPInfo> list = vipService.listVIPUser(minDate, maxDate, 1, Constant.pageCount);
+ long count = vipService.countVIPUser(minDate, maxDate);
+ System.out.println(count);
+ }
+
+
+ @Test
+ public void test3() throws Exception {
+ OrderRecord record = orderService.getOrderRecord("82");
+ pptvVipManager.buyVIP(record);
+ }
+
+ @Test
+ public void cancelOrder(){
try {
- vipService.checkOrderPayState(23 + "");
+ orderJob.cancelOrder("1000140");
} catch (Exception e) {
e.printStackTrace();
}
}
- public static void main(String[] args) {
- for (int i = 0; i < 20; i++) {
- final int p=i;
- new Thread(new Runnable() {
- @Override
- public void run() {
- HttpUtil.get("http://192.168.3.122:8080/BuWan/test/vipPay?id=27");
- System.out.println("鎵ц瀹屾垚锛�"+p);
- }
- }).start();
- }
- }
-
-
}
+
+
+
--
Gitblit v1.8.0