Pu Zhibing
2025-04-20 0b39a6b4f6962d9454a61d34bba2098ffa3993a9
Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
3个文件已修改
9 ■■■■■ 已修改文件
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverOKTravel/guns-admin/src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
@@ -328,7 +328,7 @@
                if("SUCCESS".equals(result_code)){
                    Map<String, String> map1 = new HashedMap();
                    map1.put("nonce_str", map.get("nonce_str"));
                    map1.put("out_trade_no", map.get("out_trade_no").split("_")[1]);//存储的订单code
                    map1.put("out_trade_no", map.get("out_trade_no"));//存储的订单code
                    map1.put("attach", map.get("attach"));//存储订单id
                    map1.put("total_fee", map.get("total_fee"));
                    map1.put("transaction_id", map.get("transaction_id"));//微信支付订单号
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -777,6 +777,9 @@
            System.err.println("订单数据异常:" + orderId);
            return false;
        }
        if(orderTaxi.getState() != 5){
            return false;
        }
        OrderPosition orderPosition = orderPositionService.queryNew(orderId, 2);
        String now = lon + "," + lat;
        String old = null;
DriverOKTravel/guns-admin/src/main/resources/application.yml
@@ -86,8 +86,8 @@
wx:
  grantType: authorization_code #填authorization_code
  appid: wx4d36488fa2cd2718 #应用唯一标识,在微信开放平台提交应用审核通过后获得
  appSecret: f3874e9c813f31a2e90c37346eb74d82 #应用密钥AppSecret,在微信开放平台提交应用审核通过后获得
  appid: wxf6dbaef77a7d3b91 #应用唯一标识,在微信开放平台提交应用审核通过后获得
  appSecret: 7b3f7f7091da783cb4c6531f42d9915b #应用密钥AppSecret,在微信开放平台提交应用审核通过后获得
  appletsAppid: wx4d36488fa2cd2718 #小程序APPid
  appletsAppSecret: f3874e9c813f31a2e90c37346eb74d82 #
  mchId: 1680621323 #微信支付分配的商户号