Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hong...

xiaoyong931011

2023-04-08 64ec220d6a46488ec86aeed4df88cf75d0a712af

Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng

 src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java

@@ -41,7 +41,12 @@
    /**
     * 凭证数量
     */
    VOUCHER_AMOUNT(8);
    VOUCHER_AMOUNT(8),

    /**
     * 微信支付
     */
    WECHAT(9);

    private final int value;


 src/main/java/cc/mrbird/febs/pay/service/impl/WxPayServiceImpl.java

@@ -112,7 +112,7 @@
        orderInfo.setPayTradeNo(params.get("transaction_id"));
        orderInfoMapper.updateById(orderInfo);

        commonService.changeWallet(orderInfo.getId(), FlowTypeEnum.BALANCE.getValue());
        commonService.changeWallet(orderInfo.getId(), FlowTypeEnum.WECHAT.getValue());

        /**
         * 插入一条待处理记录

 src/main/resources/application-dev.yml

@@ -18,7 +18,7 @@
          username: ct_test
          password: 123456
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://120.27.238.55:3406/db_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://120.27.238.55:3406/db_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&allowMultiQueries=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）

 src/main/resources/application-prod.yml

@@ -18,7 +18,7 @@
          username: db_mall_hongloumeng
          password: hongloumeng123!@#123
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://127.0.0.1:3306/db_mall_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&allowMultiQueries=true
          url: jdbc:mysql://127.0.0.1:3306/db_mall_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&rewriteBatchedStatements=true&allowMultiQueries=true&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）

 src/main/resources/application-test.yml

@@ -18,7 +18,7 @@
          username: ct_test
          password: 123456
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://120.27.238.55:3406/db_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://120.27.238.55:3406/db_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&allowMultiQueries=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）