111

k94314517

2023-10-26 78d4f55a5286144e98d84b6a88c82a7541c4575e

111

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -659,6 +659,7 @@
                .selectAs(BaseParam::getName,MemberRides::getParamName)
                .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .eq(MemberRides::getOrdreId,id)
                .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())
                .orderByDesc(MemberRides::getCreateDate));
        if (!CollectionUtils.isEmpty(memberRides)){
            //预计结算价格和计算时长

 server/services/src/main/resources/application-dev.yml

@@ -50,8 +50,8 @@
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
#    notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify
    notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
    keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
#    keyPath: /usr/local/apiclient_cert.p12
#    keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
    keyPath: /usr/local/apiclient_cert.p12
########################mqtt相关配置########################
mqtt:
  host: tcp://175.27.187.84:1883

 server/web/src/main/resources/application.yml

@@ -9,7 +9,7 @@
#  application:
#    name: parkbike
  profiles:
    active: dev
    active: test
  # JSON返回配置
  jackson:
    # 默认时区