From 02c10286f48a360357eccfcdad0b968519d1264f Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期六, 26 七月 2025 09:04:54 +0800 Subject: [PATCH] 合并代码 --- /dev/null | 116 ------------------- DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml | 4 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java | 125 ++++++++++++++------ MessagePushTravel/src/main/resources/application.yml | 21 ++- UserQYTTravel/guns-admin/src/main/resources/application.yml | 43 ++++-- ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml | 2 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GoodsInfoRequest.java | 12 ++ DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java | 2 8 files changed, 142 insertions(+), 183 deletions(-) diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java index 8bc51a5..99a7c02 100644 --- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java +++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java @@ -67,7 +67,7 @@ public QianYunTongConfig getQianYunTongConfig() { if("dev".equals(activeProfile)){ this.appkey = "10001104"; - this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem"; + this.privateKeyPath = "C:\\Users\\Administrator\\Desktop\\private_key_test.pem"; this.userName = "xiaofei"; this.status = "1"; this.setApiUrl("https://test-zhongtai.stqcloud.com:10070"); diff --git a/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml b/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml index 218b2c3..636dbc5 100644 --- a/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml +++ b/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml @@ -29,13 +29,13 @@ max-request-size: 100MB max-file-size: 100MB redis: - host: 127.0.0.1 + host: 192.168.110.80 port: 6379 password: 123456 database: 0 timeout: 1000 cluster: - nodes: 127.0.1.1:6379 + nodes: 192.168.110.80:6379 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular global-config: diff --git a/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml b/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml index e5924c4..602c7bb 100644 --- a/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml +++ b/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml @@ -29,7 +29,7 @@ max-request-size: 500MB max-file-size: 500MB redis: - host: 127.0.0.1 + host: 192.168.110.80 port: 6379 password: 123456 diff --git a/MessagePushTravel/src/main/resources/application.yml b/MessagePushTravel/src/main/resources/application.yml index 7248f91..9cee63e 100644 --- a/MessagePushTravel/src/main/resources/application.yml +++ b/MessagePushTravel/src/main/resources/application.yml @@ -2,8 +2,8 @@ port: 6000 spring: profiles: -# active: dev - active: prod + active: dev +# active: prod application: name: message #服务名称 servlet: @@ -11,11 +11,14 @@ max-request-size: 100MB max-file-size: 100MB redis: - host: 172.21.35.151 - port: 6512 - password: SC_cache@20#25 - database: 0 - timeout: 1000 - cluster: - nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513 + host: 192.168.110.80 + port: 6379 + password: 123456 +# host: 172.21.35.151 +# port: 6512 +# password: SC_cache@20#25 +# database: 0 +# timeout: 1000 +# cluster: +# nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513 diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java index bfd2a8d..cb09fb2 100644 --- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java +++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java @@ -26,19 +26,19 @@ // CreateTravelItineraryRequest request = new CreateTravelItineraryRequest(); // request.setScene("TRAFFIC"); // request.setPartnerId("522700"); -// request.setOrderNo("123456"); +// request.setOrderNo("0123456"); // request.setCustomerId("11448156"); // request.setDriverId("11448158"); // request.setSupplierShopId("981100006005951"); // request.setServiceType(1); // String travelItinerary = createTravelItinerary(request); -// System.err.println(travelItinerary);//1948565171253956608 +// System.err.println(travelItinerary);//1948685426689200128 //修改行程状态 // ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); // request.setScene("TRAFFIC"); // request.setPartnerId("522700"); -// request.setOrderId("1948565171253956608"); +// request.setOrderId("1948685426689200128"); // request.setStatus(7); // request.setDriverId("11448158"); // request.setSupplierShopId("981100006005951"); @@ -53,11 +53,11 @@ // tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"0\"}"); // tradeOrderCreateData.setCharge(new BigDecimal("0.01")); // tradeOrderCreateData.setChannelSource("GRJYCXWXXCX"); -// tradeOrderCreateData.setOrderId("1948565171253956608"); -// tradeOrderCreateData.setOrderNo("123456"); +// tradeOrderCreateData.setOrderId("1948685426689200128"); +// tradeOrderCreateData.setOrderNo("0123456"); // tradeOrderCreateData.setCustomerId("11448156"); // tradeOrderCreateData.setPayPartnerId("5400004"); -// tradeOrderCreateData.setPartnerPayId("1948565171253956608"); +// tradeOrderCreateData.setPartnerPayId("1948685426689200128"); // tradeOrderCreateData.setCurrency("RMB"); // tradeOrderCreateData.setTotalFee("1"); // tradeOrderCreateData.setRetUrl("/home/"); @@ -68,60 +68,107 @@ // // List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); // GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); -// goodsInfoRequest.setId("1"); -// goodsInfoRequest.setSubAppId(QianYunTongProperties.appId); +// goodsInfoRequest.setId("981100006005901"); +// goodsInfoRequest.setSubAppId("wxcbad113185a243e1"); // goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ"); // goodsInfoRequest.setProfitSharing("1"); +// goodsInfoRequest.setAreaInfo("520100"); +// goodsInfoRequest.setPayType("0"); +// goodsInfoRequest.setBusinessType("10408"); // goodsInfo.add(goodsInfoRequest); // tradeOrderCreateData.setGoodsInfo(goodsInfo); // TradeOrderCreate tradeOrderCreate = tradeOrderCreate1(tradeOrderCreateData); // System.err.println(tradeOrderCreate); -// //TradeOrderCreate(orderInfo=OrderInfo(orderId=1948565171253956608, status=null), payInfo=PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=5nUBXayFpfZz%2FXUZiMu9LyWg15VM5hbmhIjUt0hdmws%3D, payId=540000420250725000135518, status=null, payTime=null, payFee=null, paymentInfos=null), sign=ea01f3b186be02e43367b856fd2ec699)) +// //TradeOrderCreate(orderInfo=OrderInfo(orderId=1948685426689200128, status=null), payInfo=PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=5nUBXayFpfZz%2FXUZiMu9L61szNy2MhjTJ938TeNnX0U%3D, payId=540000420250725000135548, status=null, payTime=null, payFee=null, paymentInfos=null), sign=c9d849ee21dcc401cee968d4d31de04f)) //查询支付单信息 // GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest(); // getPaymentInfoDataRequest.setPartnerId("5400004"); -// getPaymentInfoDataRequest.setPartnerPayId("1948565171253956608"); +// getPaymentInfoDataRequest.setPartnerPayId("1948685426689200128"); // GetPaymentInfo getPaymentInfo = paymentInfo(getPaymentInfoDataRequest); // System.err.println(getPaymentInfo); //拉起支付 - TradePayOff1Data tradePayOff1Data = new TradePayOff1Data(); - tradePayOff1Data.setPartnerId("5400004"); - tradePayOff1Data.setScene("TRAFFIC"); - tradePayOff1Data.setPartnerPayId("1948565171253956608"); - tradePayOff1Data.setCurrency("RMB"); - tradePayOff1Data.setTotalFee("1"); - tradePayOff1Data.setRetUrl("/home/"); - tradePayOff1Data.setClientIp("127.0.0.1"); - tradePayOff1Data.setNeedLoginFlag("N"); - tradePayOff1Data.setOrderDesc("出行订单支付"); - tradePayOff1Data.setAccessMode("H5"); - List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); - GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); - goodsInfoRequest.setId("1"); - goodsInfoRequest.setSubAppId(QianYunTongProperties.appId); - goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ"); - goodsInfoRequest.setProfitSharing("1"); - goodsInfo.add(goodsInfoRequest); - tradePayOff1Data.setGoodsInfo(goodsInfo); - PayInfo payInfo = tradePayOff1(tradePayOff1Data); - System.err.println(payInfo); - - +// TradePayOff1Data tradePayOff1Data = new TradePayOff1Data(); +// tradePayOff1Data.setPartnerId("5400004"); +// tradePayOff1Data.setScene("TRAFFIC"); +// tradePayOff1Data.setPartnerPayId("1948685426689200128"); +// tradePayOff1Data.setCurrency("RMB"); +// tradePayOff1Data.setTotalFee("1"); +// tradePayOff1Data.setRetUrl("/home/"); +// tradePayOff1Data.setClientIp("127.0.0.1"); +// tradePayOff1Data.setNeedLoginFlag("N"); +// tradePayOff1Data.setOrderDesc("出行订单支付"); +// tradePayOff1Data.setAccessMode("APP"); +// List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); +// GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); +// goodsInfoRequest.setId("981100006005901"); +// goodsInfoRequest.setSubAppId("wxcbad113185a243e1"); +// goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ"); +// goodsInfoRequest.setProfitSharing("1"); +// goodsInfoRequest.setAreaInfo("520100"); +// goodsInfoRequest.setPayType("0"); +// goodsInfoRequest.setBusinessType("10408"); +// goodsInfo.add(goodsInfoRequest); +// tradePayOff1Data.setGoodsInfo(goodsInfo); +// PayInfo payInfo = tradePayOff1(tradePayOff1Data); +// System.err.println(payInfo); + //PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=5nUBXayFpfZz%2FXUZiMu9LzeRXmqmlqaCS%2BHfu5udIt4%3D, payId=540000420250725000135549, status=null, payTime=null, payFee=null, paymentInfos=null), sign=8154ba2728280900b122c56352c1c7fe) + + + // (补偿单)拉起支付 +// TradePayOffData tradePayOffData = new TradePayOffData(); +// tradePayOffData.setPartnerId("5400004"); +// tradePayOffData.setScene("TRAFFIC"); +// tradePayOffData.setPartnerPayId("1948685426689200128"); +// tradePayOffData.setCurrency("RMB"); +// tradePayOffData.setTotalFee("1"); +// tradePayOffData.setRetUrl("/home/"); +// tradePayOffData.setClientIp("127.0.0.1"); +// tradePayOffData.setNeedLoginFlag("N"); +// tradePayOffData.setOrderDesc("出行订单支付"); +// tradePayOffData.setAccessMode("APP"); +// List<PaymentInfoRequest> paymentInfoRequests = new ArrayList<>(); +// PaymentInfoRequest paymentInfoRequest = new PaymentInfoRequest(); +// paymentInfoRequest.setPayModeId("501212"); +// paymentInfoRequests.add(paymentInfoRequest); +// tradePayOffData.setPaymentInfos(paymentInfoRequests); +// List<GoodsInfo> goodsInfo = new ArrayList<>(); +// GoodsInfo goodsInfo1 = new GoodsInfo(); +// goodsInfo1.setMerchantCode(""); +// goodsInfo1.setCustId(""); +// goodsInfo1.setCustName(""); +// goodsInfo1.setProfitSharing("1"); +// goodsInfo.add(goodsInfo1); +// tradePayOffData.setGoodsInfo(goodsInfo); +// PayInfo payInfo1 = tradePayOff(tradePayOffData); +// System.err.println(payInfo1); + + //订单创建 // CreateOrderRequest createOrderRequest = new CreateOrderRequest(); -// createOrderRequest.setTreatShopId(""); +// createOrderRequest.setTreatShopId("11448158"); // createOrderRequest.setOrderAppId("52270015"); // createOrderRequest.setScene("TRAFFIC"); // createOrderRequest.setPartnerId("522700"); -// createOrderRequest.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}"); +// createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"0\"}"); // createOrderRequest.setCharge(new BigDecimal("0.01")); // createOrderRequest.setChannelSource("GRJYCXWXXCX"); -// createOrderRequest.setOrderId(""); -// createOrderRequest.setOrderNo(""); -// createOrderRequest.setCustomerId(""); +// createOrderRequest.setOrderId("1948685426689200128"); +// createOrderRequest.setOrderNo("0123456"); +// createOrderRequest.setCustomerId("11448156"); // OrderInfo orderInfo = tradeOrderCreate(createOrderRequest); +// System.err.println(orderInfo); + //行程单列表查询 +// GetTravelItineraryListRequest request = new GetTravelItineraryListRequest(); +// request.setScene("TRAFFIC"); +// request.setPartnerId("522700"); +// request.setCustomerId("11448156"); +// request.setOrderNo("0123456"); +// request.setDriverId("11448158"); +// ListPage<TravelItinerary> travelItineraryList = getTravelItineraryList(request); +// System.err.println(travelItineraryList); + } /** @@ -404,7 +451,7 @@ */ public static PayInfo tradePayOff(TradePayOffData tradePayOffData) { TradeRequest request = new TradeRequest<TradePayOffData>(); - request.setSceneId(QianYunTongProperties.sceneId); + request.setSceneId("1774717104844095488"); request.setAppId(QianYunTongProperties.appkey); request.setConfigVersion(1); request.setRequestId(UUIDUtil.getRandomCode()); diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GoodsInfoRequest.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GoodsInfoRequest.java index 5d129e3..b3d7f21 100644 --- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GoodsInfoRequest.java +++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GoodsInfoRequest.java @@ -24,4 +24,16 @@ * 分账标识。0:不分账,1:分账 */ private String profitSharing; + /** + * 地区标识,默认传520100 + */ + private String areaInfo; + /** + * 是否匿名。默认传0 + */ + private String payType; + /** + * 业务类型,默认传10408 + */ + private String businessType; } diff --git a/UserQYTTravel/guns-admin/src/main/resources/application-dev.yml b/UserQYTTravel/guns-admin/src/main/resources/application-dev.yml deleted file mode 100644 index 1f46a52..0000000 --- a/UserQYTTravel/guns-admin/src/main/resources/application-dev.yml +++ /dev/null @@ -1,116 +0,0 @@ -server: - port: 8006 - -guns: - swagger-open: true #是否开启swagger (true/false) - kaptcha-open: false #是否开启登录时验证码 (true/false) - file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) - picture-server-address: http://192.168.0.43/resources/ #图片服务器地址 - spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) - session-invalidate-time: 1800 #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒 - session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒 - -spring: - application: - name: user-server - profiles: -# active: dev - active: prod - mvc: - static-path-pattern: /static/** - view: - prefix: /WEB-INF/view - devtools: - restart: - enabled: false - additional-paths: src/main/java - exclude: static/**,WEB-INF/view/** - servlet: - multipart: - max-request-size: 100MB - max-file-size: 100MB - redis: - host: 172.21.35.151 - port: 6512 - password: SC_cache@20#25 - database: 0 - timeout: 1000 - cluster: - nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513 - -mybatis-plus: - typeAliasesPackage: com.stylefeng.guns.modular - configuration: - log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl - - - -eureka: - client: - service-url: #注册中心地址 - defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接 - register-with-eureka: true #在注册中心进行注册 - fetch-registry: true #从Eureka中获取注册信息。 - ---- - - -#配置Swagger接口扫描范围 -swagger: - base-package: com.stylefeng.guns.modular - - -spring: - datasource: - url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai - username: traffic_scusr - password: QYT_sc@20#25 - db-name: traffic_scdb #用来搜集数据库的所有表 - filters: wall,mergeStat - - ---- -spring: - data: - mongodb: - uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track - - ---- - - - -wx: - grantType: authorization_code #填authorization_code - appid: 111 #应用唯一标识,在微信开放平台提交应用审核通过后获得 - appSecret: 111 #应用密钥AppSecret,在微信开放平台提交应用审核通过后获得 - appletsAppid: wxcc3c9058e2b294db #小程序APPid - appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 # - mchId: 111 #微信支付分配的商户号 - key: 111 #key为商户平台设置的密钥key: - ---- - -alipay: - appid: 111 #应用程序唯一标识 - appPrivateKey: 111 #开发者应用私钥 - alipayPublicKey: ; #应用公钥 - alipay_public_key: 111 #支付宝公钥 - ---- - -juhe: #聚合数据 - appKey: 111 # - - ---- - -#支付回调地址 -#正式环境 -callbackPath: https://traffic.qytzt.cn/user - - ---- - -#交通部推送数据功能开关 -pushMinistryOfTransport: false diff --git a/UserQYTTravel/guns-admin/src/main/resources/application.yml b/UserQYTTravel/guns-admin/src/main/resources/application.yml index 1f46a52..3d56997 100644 --- a/UserQYTTravel/guns-admin/src/main/resources/application.yml +++ b/UserQYTTravel/guns-admin/src/main/resources/application.yml @@ -14,8 +14,8 @@ application: name: user-server profiles: -# active: dev - active: prod + active: dev + # active: prod mvc: static-path-pattern: /static/** view: @@ -30,13 +30,17 @@ max-request-size: 100MB max-file-size: 100MB redis: - host: 172.21.35.151 - port: 6512 - password: SC_cache@20#25 - database: 0 - timeout: 1000 - cluster: - nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513 + host: 192.168.110.80 + port: 6379 + password: 123456 +# redis: +# host: 172.21.35.151 +# port: 6512 +# password: SC_cache@20#25 +# database: 0 +# timeout: 1000 +# cluster: +# nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular @@ -59,21 +63,30 @@ swagger: base-package: com.stylefeng.guns.modular - spring: datasource: - url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai - username: traffic_scusr - password: QYT_sc@20#25 - db-name: traffic_scdb #用来搜集数据库的所有表 + url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai + username: root + password: 123456 + db-name: qyttravel #用来搜集数据库的所有表 filters: wall,mergeStat + + +#spring: +# datasource: +# url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai +# username: traffic_scusr +# password: QYT_sc@20#25 +# db-name: traffic_scdb #用来搜集数据库的所有表 +# filters: wall,mergeStat --- spring: data: mongodb: - uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track + uri: mongodb://192.168.110.80:27017/traveling_track +# uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track --- -- Gitblit v1.7.1