tangfang/pangd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

heb

Browse Source
This commit is contained in:
tangfang
2023-02-01 16:29:00 +08:00
parent 4b8f091049
commit 4f074f2339
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
prod.cmd
View File

@@ -1,31 +1,22 @@
@echo off
SET SH=docker rm -f pd-order;
SET SH=%SH% docker run --name pd-order -it -d --restart always
SET SH=%SH% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd
SET SH=%SH% pd-order:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties;
SET SH=docker rm -f pd-order-1;
SET SH=%SH% docker run --name pd-order-1 -it -d --restart always
SET SH=%SH% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd
SET SH=%SH% pd-order:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties
SET SH1_NAME=pd-order
SET SH1=docker rm -f %SH1_NAME%;
SET SH1=%SH1% docker run --name %SH1_NAME% -it -d --restart always
SET SH1=%SH1% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd
SET SH1=%SH1% %SH1_NAME%:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties;
SET SH1=docker rm -f pd-order-1;
SET SH1=%SH1% docker run --name pd-order-1 -it -d --restart always
SET SH1=%SH1% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd
SET SH1=%SH1% %SH1_NAME%:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties
SET SH_NAME=pd-order
SET SH=docker rm -f %SH_NAME%;
SET SH=%SH% docker run --name %SH_NAME% -it -d --restart always
SET SH=%SH% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd
SET SH=%SH% %SH_NAME%:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties;
SET SH=%SH% docker rm -f %SH_NAME%-1;
SET SH=%SH% docker run --name %SH_NAME%-1 -it -d --restart always
SET SH=%SH% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd
SET SH=%SH% %SH_NAME%:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties
if 1 equ 1 (
java_docker -ssh root@spd1 -sh "%SH%"
java_docker -dn "%SH_NAME%" -ssh root@spd1 -sh "%SH%"
TIMEOUT /T 60
java_docker -mcc -dn "%SH1_NAME%" -ssh root@spd2 -sh "%SH1%"
java_docker -mcc -dn "%SH_NAME%" -ssh root@spd2 -sh "%SH%"
)
@echo on

19
prod2.cmd Normal file
View File

@@ -0,0 +1,19 @@
@echo off
SET SH_NAME=pd-order
SET SH=docker rm -f %SH_NAME%;
SET SH=%SH% docker run --name %SH_NAME% -it -d --restart always
SET SH=%SH% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd
SET SH=%SH% %SH_NAME%:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties;
SET SH=%SH% docker rm -f %SH_NAME%-1
if 1 equ 1 (
java_docker -dn "%SH_NAME%" -ssh root@spd1 -sh "%SH%"
TIMEOUT /T 60
java_docker -mcc -dn "%SH_NAME%" -ssh root@spd2 -sh "%SH%"
)
@echo on

4
src/main/java/com/pangding/web/order/dao/impl/OrderDaoImpl.java
View File

@@ -111,9 +111,7 @@ public class OrderDaoImpl extends BaseDaoImpl implements OrderDao {
"OR o.id in (SELECT order_id FROM pd_order_ticket_detail as od WHERE od.verify_code = ? )" +
"OR o.id IN (SELECT order_id FROM pd_order_tourist as ot WHERE ot.phone= ? OR ot.credential_number = ?) ) ")
.addPara("playDateSearch", "{INDEX}", " FORCE INDEX(Index_play_date) ")
// .addPara("startOrderTime", "{ORDER}"," ORDER BY o.order_time desc")
;
.addPara("playDateSearch", "{INDEX}", " FORCE INDEX(Index_play_date) ");
table.add(QUERY_ORDER_TOTAL, "SELECT unit_price,cost_price,sum(order_num) as order_num,sum(refund_num) as refund_num," +
"sum(check_num) as check_num,sum(total_money) as total_money,sum(pd_discount_money) as pd_discount_money" +

4
src/main/java/com/pangding/web/order/service/order/base/CreateLock.java
View File

@@ -117,6 +117,10 @@ public class CreateLock {
}
public List<OrderStatusVo> getOrderStatus(OrderRefundReqVo req) {
// if(StringHelper.isEmpty(req.getRefundType())){
// return null;
// }
// req.setRefundType(1);
if(OrderConstant.REFUND_TYPR_DEPOSIT == req.getRefundType()
|| OrderConstant.REFUND_TYPR_All == req.getRefundType()){
req.setOrderId(StringHelper.getNewID());