yuhaitao14 7 years ago
parent
commit
87a4e25001

+ 4 - 2
shop/src/main/java/com/zskk/shop/controller/web/BuyOrderController.java

@@ -97,9 +97,11 @@ public class BuyOrderController extends AbstractController {
 			throw new ZSKKException(ErrorConstant.BUY_ORDER_ID_ERROR);
 			throw new ZSKKException(ErrorConstant.BUY_ORDER_ID_ERROR);
 		}
 		}
 		if (buyOrder.getPayStatus().equals(BuyOrderService.PAY_STATUS_PAYED)){
 		if (buyOrder.getPayStatus().equals(BuyOrderService.PAY_STATUS_PAYED)){
-			throw new ZSKKException(ErrorConstant.ORDER_PAYED_ERROR);
+			return this.myorders(model);
+		}else{
+			return this.showPayOrdeDtail(model, buyOrder);
 		}
 		}
-		return this.showPayOrdeDtail(model, buyOrder);
+		
 	}
 	}
 	
 	
 	private String showPayOrdeDtail(Model model, BuyOrder buyOrder){
 	private String showPayOrdeDtail(Model model, BuyOrder buyOrder){

+ 3 - 3
shop/src/main/resource/application-dev.properties

@@ -1,8 +1,8 @@
 server.port=10001
 server.port=10001
 
 
-spring.datasource.url=jdbc:mysql://47.104.4.5:3306/tjshop?allowMultiQueries=true&useSSL=false&characterEncoding=utf8
-spring.datasource.username=pacs
-spring.datasource.password=ZSKK@2017~!@#
+spring.datasource.url=jdbc:mysql://localhost:3306/shop?allowMultiQueries=true&useSSL=false&characterEncoding=utf8
+spring.datasource.username=root
+spring.datasource.password=123456
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 
 

+ 17 - 0
shop/src/main/resource/application-test.properties

@@ -0,0 +1,17 @@
+server.port=10001
+
+spring.datasource.url=jdbc:mysql://47.104.4.5:3306/tjshop?allowMultiQueries=true&useSSL=false&characterEncoding=utf8
+spring.datasource.username=pacs
+spring.datasource.password=ZSKK@2017~!@#
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+
+zskk.myhost=http://testshop.pacsonline.cn/
+zskk.secret=6244c0f6da164d4db51fdb27cff15c95
+zskk.tjcenter=http://kunlun.pacsonline.cn/
+zskk.tjkey=Kq2gNG2WnWeJG3ug1SedNo2oGZHujs49
+zskk.uccenter=http://testucserver.pacsonline.cn/
+zskk.uclongin=http://testuc.pacsonline.cn/
+zskk.companyid=1
+
+logging.level.com.zskk.shop.dao=DEBUG

+ 2 - 2
shop/src/main/resource/templates/pay.html

@@ -119,7 +119,7 @@
                     		支付完成
                     		支付完成
                     	</div>
                     	</div>
                     	<div style="margin-top: 20px;">
                     	<div style="margin-top: 20px;">
-                    		<a href="#" style="color: #0FAFD4">预约体检</a>
+                    		<a href="/mypayedorders" style="color: #0FAFD4">预约体检</a>
                     	</div>
                     	</div>
                     </div>
                     </div>
                 </div>
                 </div>
@@ -155,7 +155,7 @@
     			$.get("/payquery/" + orderid, function(data){
     			$.get("/payquery/" + orderid, function(data){
     				if (data.code == 0){
     				if (data.code == 0){
     					if (data.obj){
     					if (data.obj){
-    						$("#qrCodeDiv").hide();
+    						$("#qrCode").empty();
     						$("#payedDiv").show();
     						$("#payedDiv").show();
     					}
     					}
     				}
     				}