2.0新增

无关风月

2025-03-26 d6ad5d250ecfadbc1e2a3db4d9e8e5b57c599b41

2.0新增

 DriverOKTravel/guns-admin/pom.xml

@@ -240,12 +240,7 @@
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.stylefeng</groupId>
            <artifactId>guns-admin</artifactId>
            <version>1.0.0</version>
            <scope>compile</scope>
        </dependency>

    </dependencies>

    <build>

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java

@@ -12,10 +12,7 @@
import com.stylefeng.guns.modular.system.dao.TUseMoneyMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.UUIDUtil;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -266,6 +263,7 @@
            }
            eq.orderBy("insertTime",false);
            List<TransactionDetails> transactionDetails = iTransactionDetailsService.selectList(eq);
            List<OrderTaxi> orderTaxis = orderTaxiService.selectList(null);
            if ((state!=null&&state==1)||(state!=null&&state==2)){
                List<HistoryVo> historyVos = new ArrayList<>();
                for (TransactionDetails transactionDetail : transactionDetails) {
@@ -281,6 +279,12 @@
                        }
                        historyVo.setAddordown(1);
                    }else {
                        OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
                        if (orderTaxi!=null){
                            if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1||orderTaxi.getPayType()!=2)){
                                continue;
                            }
                        }
                        historyVo.setState("扣除");
                        historyVo.setAddordown(0);
                    }
@@ -313,6 +317,12 @@
                    }
                    historyVo.setAddordown(1);
                }else {
                    OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
                    if (orderTaxi!=null){
                        if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1||orderTaxi.getPayType()!=2)){
                            continue;
                        }
                    }
                    historyVo.setState("扣除");
                    historyVo.setAddordown(0);
                }

 DriverOKTravel/guns-admin/src/main/resources/application.yml

@@ -51,12 +51,12 @@

spring:
  datasource:
#    url: jdbc:mysql://127.0.0.1:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    username: root
#    password: 123456
    url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: XianNing@2024!
#    url: jdbc:mysql://127.0.0.1:3306/jk_fitness?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    username: root
#    password: root
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat

@@ -88,10 +88,10 @@
  grantType: authorization_code #填authorization_code
  appid: wx4d36488fa2cd2718 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: f3874e9c813f31a2e90c37346eb74d82 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: #小程序APPid
  appletsAppSecret: #
  mchId: 1593080081 #微信支付分配的商户号
  key: JnhREmZwHNKyFUQPEhijp1gdaCUzKg8P #key为商户平台设置的密钥key：
  appletsAppid: wx4d36488fa2cd2718 #小程序APPid
  appletsAppSecret: f3874e9c813f31a2e90c37346eb74d82 #
  mchId: 1680621323 #微信支付分配的商户号
  key: g2sHcxXkfQ7HO92B5qhTgrA6XTLm9KYj #key为商户平台设置的密钥key：

---

@@ -125,7 +125,7 @@

#支付回调地址
#正式环境
callbackPath: http://36.134.221.234:7777/driver
callbackPath: https://xn95128.cn/driver
#正式测试环境
#callbackPath: http://39.108.148.228:80/driver


 DriverOKTravel/guns-admin/src/main/resources/redis.properties

@@ -7,7 +7,7 @@
spring.redis.port=6379
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=XianNing@2024!
#spring.redis.password=
#spring.redis.password=123456
# Á¬½Ó³Ø×î´óÁ¬½ÓÊý£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©
spring.redis.jedis.pool.max-active=1024
# Á¬½Ó³Ø×î´ó×èÈûµÈ´ýʱ¼ä£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©