diff --git a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaConfigService.java b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaConfigService.java index 5a84e98..da27dd9 100644 --- a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaConfigService.java +++ b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaConfigService.java @@ -111,12 +111,11 @@ public class LaKaLaConfigService { // 请求参数 Map param = new HashMap<>(); param.put("timestamp", new Date().getTime()); - param.put("rnd", GenerateUtil.generateRandomString(18)); param.put("ver", "1.0.0"); - param.put("reqId", new Date().getTime()); + param.put("reqId", GenerateUtil.generateRandomString(18)); Map map = new HashMap<>(); - map.put("version", "1.0"); + map.put("tradeMode", "WECHAT"); map.put("subMerchantId", subMerchantId); map.put("merchantNo", merCupNo); param.put("reqData", map); diff --git a/service/src/main/java/com/hfkj/dao/OpenApiTradeOrderMapper.java b/service/src/main/java/com/hfkj/dao/OpenApiTradeOrderMapper.java index e94871f..70db9c9 100644 --- a/service/src/main/java/com/hfkj/dao/OpenApiTradeOrderMapper.java +++ b/service/src/main/java/com/hfkj/dao/OpenApiTradeOrderMapper.java @@ -21,6 +21,7 @@ public interface OpenApiTradeOrderMapper { " a.pay_time payTime," + " a.mer_no merchantNo," + " a.platform_trade_no platformTradeNo," + + " a.acc_trade_no accTradeNo," + " a.out_trade_no outTradeNo, " + " a.pay_user_id payUserId, " + " \"JSAPI\" as tradeType," + diff --git a/service/src/main/java/com/hfkj/openapi/v1/model/TradeBillsModel.java b/service/src/main/java/com/hfkj/openapi/v1/model/TradeBillsModel.java index 519fce6..945897c 100644 --- a/service/src/main/java/com/hfkj/openapi/v1/model/TradeBillsModel.java +++ b/service/src/main/java/com/hfkj/openapi/v1/model/TradeBillsModel.java @@ -25,6 +25,9 @@ public class TradeBillsModel { @ExcelProperty("平台交易单号") private String platformTradeNo; @ColumnWidth(25) + @ExcelProperty("账户端交易单号") + private String accTradeNo; + @ColumnWidth(25) @ExcelProperty("商户交易单号") private String outTradeNo; @ColumnWidth(25)