From e6dead8fecfec44af43cac02ae6620004d8254d1 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 16 Jan 2024 10:45:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BsMerPlatformPeriodController.java | 12 +- .../com/cweb/controller/TestController.java | 3 +- .../java/com/cweb/notify/LLGController.java | 72 +++++----- .../hfkj/channel/llg/config/LLGConfig.java | 7 +- .../channel/llg/service/LLGMerService.java | 48 +++++-- .../channel/llg/service/LLGOrderService.java | 13 +- .../com/hfkj/channel/llg/util/HttpsUtils.java | 2 +- .../java/com/hfkj/config/CommonSysConfig.java | 10 ++ .../hfkj/dao/BsMerPlatformPeriodMapper.java | 19 ++- .../dao/BsMerPlatformPeriodPaidMapper.java | 25 ++-- .../BsMerPlatformPeriodPaidSqlProvider.java | 14 ++ .../dao/BsMerPlatformPeriodSqlProvider.java | 28 ++++ .../java/com/hfkj/dao/BsTradeOrderMapper.java | 20 ++- .../com/hfkj/dao/BsTradeOrderSqlProvider.java | 28 ++++ .../java/com/hfkj/dao/LlgBankCodeMapper.java | 8 +- .../com/hfkj/dao/LlgBankCodeSqlProvider.java | 8 +- .../com/hfkj/entity/BsMerPlatformPeriod.java | 33 +++++ .../entity/BsMerPlatformPeriodExample.java | 131 ++++++++++++++++++ .../hfkj/entity/BsMerPlatformPeriodPaid.java | 16 +++ .../BsMerPlatformPeriodPaidExample.java | 70 ++++++++++ .../java/com/hfkj/entity/BsTradeOrder.java | 32 +++++ .../com/hfkj/entity/BsTradeOrderExample.java | 120 ++++++++++++++++ .../java/com/hfkj/entity/LlgBankCode.java | 6 +- .../com/hfkj/entity/LlgBankCodeExample.java | 30 ++-- .../impl/BsTradeOrderRefundServiceImpl.java | 2 +- .../resources/dev/commonConfig.properties | 3 + .../prod-9606/commonConfig.properties | 4 + .../resources/prod/commonConfig.properties | 4 + 28 files changed, 671 insertions(+), 97 deletions(-) diff --git a/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java b/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java index 93c3f35..cb64f26 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java @@ -64,6 +64,15 @@ public class BsMerPlatformPeriodController { ) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } + // 渠道平台 + PlatformPeriodTypeEnum platformPeriodType = PlatformPeriodTypeEnum.getDataByNumber(body.getInteger("platformPeriodType")); + if (platformPeriodType == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的渠道订单"); + } + if (platformPeriodType.getNumber().equals(PlatformPeriodTypeEnum.type1.getNumber()) + && body.getBigDecimal("authCapital") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } // 查询商户 BsMer mer = merService.getMer(body.getString("merNo")); @@ -72,7 +81,7 @@ public class BsMerPlatformPeriodController { } // 查询记录 - BsMerPlatformPeriod merPlatformPeriod = merPlatformPeriodService.getDetailByMer(mer.getMerNo(), PlatformPeriodTypeEnum.getDataByNumber(body.getInteger("platformPeriodType"))); + BsMerPlatformPeriod merPlatformPeriod = merPlatformPeriodService.getDetailByMer(mer.getMerNo(), platformPeriodType); if (merPlatformPeriod != null && !merPlatformPeriod.getStatus().equals(MerPlatformPeriodStatusEnum.status3.getNumber())) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "状态错误，无法多次申请"); } @@ -90,6 +99,7 @@ public class BsMerPlatformPeriodController { merPlatformPeriod.setStatus(MerPlatformPeriodStatusEnum.status2.getNumber()); merPlatformPeriod.setSuggestionReject(null); merPlatformPeriod.setAgreementPics(body.getString("agreementPics")); + merPlatformPeriod.setAuthCapital(body.getBigDecimal("authCapital")); List periodPaidList = new ArrayList<>(); List periodRateList = new ArrayList<>(); diff --git a/cweb/src/main/java/com/cweb/controller/TestController.java b/cweb/src/main/java/com/cweb/controller/TestController.java index 9acdaba..1aaf585 100644 --- a/cweb/src/main/java/com/cweb/controller/TestController.java +++ b/cweb/src/main/java/com/cweb/controller/TestController.java @@ -848,7 +848,8 @@ public class TestController { // return ResponseMsgUtil.success(llgOrderService.refund("109", "ZF1130202312221426094021780000", "02", new BigDecimal("1"))); // return ResponseMsgUtil.success(LLGMerService.upload(new File(code))); // return ResponseMsgUtil.success(llgMerService.merApply(Long.parseLong(code))); - return ResponseMsgUtil.success(llgMerService.merDetail(Long.parseLong(code))); + // return ResponseMsgUtil.success(llgMerService.merDetail(Long.parseLong(code))); + return ResponseMsgUtil.success(llgOrderService.refund(code)); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/cweb/src/main/java/com/cweb/notify/LLGController.java b/cweb/src/main/java/com/cweb/notify/LLGController.java index 6654906..cf4901e 100644 --- a/cweb/src/main/java/com/cweb/notify/LLGController.java +++ b/cweb/src/main/java/com/cweb/notify/LLGController.java @@ -106,14 +106,16 @@ public class LLGController { System.out.println(reqBody); JSONObject respData = JSONObject.parseObject(reqBody); - // 示例：{"application_form_id":3878,"mer_id":"0","result":"图片模糊，请重新上传","status":"3"} - + // 失败示例：{"application_form_id":3878,"mer_id":"0","result":"图片模糊，请重新上传","status":"3"} + // 成功示例：{"application_form_id":3878,"data":[{"name":"花呗分期","market_id":"2619","pkg_id":"55","fee_paid_type":0}],"mer_id":"288","status":"2"} + // {"application_form_id":3879,"mer_id":"289","status":"2"} BsMerPlatformPeriod period = merPlatformPeriodService.getDetail(respData.getString("application_form_id"), PlatformPeriodTypeEnum.type1); if (period != null) { // 1:等待审核 2:通过 3:需要重新提交 4:拒绝 Integer status = respData.getInteger("status"); if (status == 2) { period.setStatus(PlatformPeriodStatusEnum.status1.getNumber()); + period.setPlatformMerNo(respData.getString("mer_id")); merPlatformPeriodService.editData(period); // 查询商户 @@ -122,38 +124,44 @@ public class LLGController { mer.setPeriodStatus(true); merService.update(mer); } - - for (Object obj : respData.getJSONArray("data")) { - JSONObject data = (JSONObject) obj; - // 贴息方式 1:商户贴息 2:用户贴息 3:商户用户各一半 - if (data.getString("fee_paid_type").equals("1")) { - // Todo 目前只有银联分期，花呗未开通业务。MerPlatformPeriodPayTypeEnum 类型写死 - BsMerPlatformPeriodPaid periodPaid = merPlatformPeriodPaidService.getDetail(period.getMerNo(), PlatformPeriodTypeEnum.type1, MerPlatformPeriodPayTypeEnum.type1, MerPlatformPeriodFeePaidTypeEnum.type1); - if (periodPaid != null) { - periodPaid.setPlatformMarketId(data.getString("market_id")); - periodPaid.setPlatformPkgId(data.getString("pkg_id")); - merPlatformPeriodPaidService.editData(periodPaid); - } - - } else if (data.getString("fee_paid_type").equals("2")) { - // Todo 目前只有银联分期，花呗未开通业务。MerPlatformPeriodPayTypeEnum 类型写死 - BsMerPlatformPeriodPaid periodPaid = merPlatformPeriodPaidService.getDetail(period.getMerNo(), PlatformPeriodTypeEnum.type1, MerPlatformPeriodPayTypeEnum.type1, MerPlatformPeriodFeePaidTypeEnum.type2); - if (periodPaid != null) { - periodPaid.setPlatformMarketId(data.getString("market_id")); - periodPaid.setPlatformPkgId(data.getString("pkg_id")); - merPlatformPeriodPaidService.editData(periodPaid); - } - - } else if (data.getString("fee_paid_type").equals("3")) { - // Todo 目前只有银联分期，花呗未开通业务。MerPlatformPeriodPayTypeEnum 类型写死 - BsMerPlatformPeriodPaid periodPaid = merPlatformPeriodPaidService.getDetail(period.getMerNo(), PlatformPeriodTypeEnum.type1, MerPlatformPeriodPayTypeEnum.type1, MerPlatformPeriodFeePaidTypeEnum.type3); - if (periodPaid != null) { - periodPaid.setPlatformMarketId(data.getString("market_id")); - periodPaid.setPlatformPkgId(data.getString("pkg_id")); - merPlatformPeriodPaidService.editData(periodPaid); + if (respData.getJSONArray("data") != null) { + for (Object obj : respData.getJSONArray("data")) { + JSONObject data = (JSONObject) obj; + // 贴息方式 1:商户贴息 2:用户贴息 3:商户用户各一半 + if (data.getString("fee_paid_type").equals("1")) { + // Todo 目前只有银联分期，花呗未开通业务。MerPlatformPeriodPayTypeEnum 类型写死 + BsMerPlatformPeriodPaid periodPaid = merPlatformPeriodPaidService.getDetail(period.getMerNo(), PlatformPeriodTypeEnum.type1, MerPlatformPeriodPayTypeEnum.type1, MerPlatformPeriodFeePaidTypeEnum.type1); + if (periodPaid != null) { + periodPaid.setPlatformNo(period.getPlatformNo()); + periodPaid.setPlatformMerNo(period.getPlatformMerNo()); + periodPaid.setPlatformMarketId(data.getString("market_id")); + periodPaid.setPlatformPkgId(data.getString("pkg_id")); + merPlatformPeriodPaidService.editData(periodPaid); + } + + } else if (data.getString("fee_paid_type").equals("2")) { + // Todo 目前只有银联分期，花呗未开通业务。MerPlatformPeriodPayTypeEnum 类型写死 + BsMerPlatformPeriodPaid periodPaid = merPlatformPeriodPaidService.getDetail(period.getMerNo(), PlatformPeriodTypeEnum.type1, MerPlatformPeriodPayTypeEnum.type1, MerPlatformPeriodFeePaidTypeEnum.type2); + if (periodPaid != null) { + periodPaid.setPlatformNo(period.getPlatformNo()); + periodPaid.setPlatformMerNo(period.getPlatformMerNo()); + periodPaid.setPlatformMarketId(data.getString("market_id")); + periodPaid.setPlatformPkgId(data.getString("pkg_id")); + merPlatformPeriodPaidService.editData(periodPaid); + } + + } else if (data.getString("fee_paid_type").equals("3")) { + // Todo 目前只有银联分期，花呗未开通业务。MerPlatformPeriodPayTypeEnum 类型写死 + BsMerPlatformPeriodPaid periodPaid = merPlatformPeriodPaidService.getDetail(period.getMerNo(), PlatformPeriodTypeEnum.type1, MerPlatformPeriodPayTypeEnum.type1, MerPlatformPeriodFeePaidTypeEnum.type3); + if (periodPaid != null) { + periodPaid.setPlatformNo(period.getPlatformNo()); + periodPaid.setPlatformMerNo(period.getPlatformMerNo()); + periodPaid.setPlatformMarketId(data.getString("market_id")); + periodPaid.setPlatformPkgId(data.getString("pkg_id")); + merPlatformPeriodPaidService.editData(periodPaid); + } } } - } } else if (status == 3 || status == 4) { diff --git a/service/src/main/java/com/hfkj/channel/llg/config/LLGConfig.java b/service/src/main/java/com/hfkj/channel/llg/config/LLGConfig.java index 14cb022..7470520 100644 --- a/service/src/main/java/com/hfkj/channel/llg/config/LLGConfig.java +++ b/service/src/main/java/com/hfkj/channel/llg/config/LLGConfig.java @@ -1,5 +1,7 @@ package com.hfkj.channel.llg.config; +import com.hfkj.config.CommonSysConst; + /** * 零零购 * @className: LLGConfig @@ -8,9 +10,8 @@ package com.hfkj.channel.llg.config; **/ public class LLGConfig { + public static final String requestUrl = CommonSysConst.getSysConfig().getLlg_request_url(); - public static final String requestUrl = "https://abcd.zjdt.cc"; - - public static final String key = "BMKp20Omcv9u7TqGAhydCw63"; + public static final String key = CommonSysConst.getSysConfig().getLlg_key(); } diff --git a/service/src/main/java/com/hfkj/channel/llg/service/LLGMerService.java b/service/src/main/java/com/hfkj/channel/llg/service/LLGMerService.java index e688c90..cf021be 100644 --- a/service/src/main/java/com/hfkj/channel/llg/service/LLGMerService.java +++ b/service/src/main/java/com/hfkj/channel/llg/service/LLGMerService.java @@ -128,10 +128,10 @@ public class LLGMerService { map.put("biz_province_code", bizRegion.getProvinceCode().toString()); map.put("biz_city_code", bizRegion.getCityCode().toString()); map.put("biz_district_code", bizRegion.getAreaCode().toString()); - map.put("biz_address", merDetail.getStoreModel().getAddress()); - map.put("service_phone", merDetail.getRegName()); - map.put("salesman_name", merDetail.getRegPhone()); - map.put("salesman_phone", merDetail.getRegEmail()); + map.put("biz_address", merDetail.getStoreModel().getStoreRegion().getAddress()); + map.put("service_phone", merDetail.getStoreModel().getTelephone()); + map.put("salesman_name", merDetail.getRegName()); + map.put("salesman_phone", merDetail.getRegPhone()); /***** 分期配置 ******/ // 银联分期 @@ -157,8 +157,8 @@ public class LLGMerService { } // 花呗分期 - map.put("open_hua_bei", platformPeriod.getOpenUnionpay().equals(true)?1:2); // 开通银联分期 1.开通 2.不开通 - if (platformPeriod.getOpenUnionpay().equals(true)) { + map.put("open_hua_bei", platformPeriod.getOpenAlipay().equals(true)?1:2); // 开通银联分期 1.开通 2.不开通 + if (platformPeriod.getOpenAlipay().equals(true)) { map.put("hua_bei_pay_fee_paid", platformPeriod.getAlipayFeePaid()); // 花呗贴息方式 1:商户贴息 2:用户贴息 // 花呗分期费率 List unionpay1RateList = merPlatformPeriodRateService.getList(platformPeriod.getId(), MerPlatformPeriodRateTypeEnum.type3); @@ -173,11 +173,14 @@ public class LLGMerService { /***** 营业执照 ******/ map.put("address", merDetail.getBlisRegAddress()); map.put("bus_lic_no", merDetail.getBlisNo()); - map.put("license_begin_date", merDetail.getBlisPeriodStart().replace("年", "-").replace("月", "-").replace("日", "")); + map.put("auth_capital", platformPeriod.getAuthCapital().multiply(new BigDecimal("100")).toString()); + map.put("license_begin_date", merDetail.getBlisPeriodStart().replace("年", "").replace("月", "").replace("日", "")); if (merDetail.getBlisPeriodType().equals(2)) { + map.put("license_validity_type", "1"); // 营业执照 0：有期限，1：无期限 map.put("cert_indate", "29991231"); } else { - map.put("cert_indate", merDetail.getBlisPeriodStart().replace("年", "-").replace("月", "-").replace("日", "")); + map.put("license_validity_type", "0"); // 营业执照 0：有期限，1：无期限 + map.put("cert_indate", merDetail.getBlisPeriodStart().replace("年", "").replace("月", "").replace("日", "")); } /***** 营业执照 ******/ @@ -186,8 +189,10 @@ public class LLGMerService { map.put("legal_rep_id_card", merDetail.getLarIdCard()); map.put("legal_cert_begin_date", merDetail.getLarIdCardPeriodEnd().replace(".", "")); if (merDetail.getLarIdCardPeriodType().equals(2)) { + map.put("legal_cert_validity_type", "1"); // 法人身份证 0：有期限，1：无期限 map.put("legal_cert_end_date", "29991231"); } else { + map.put("legal_cert_validity_type", "0"); // 法人身份证 0：有期限，1：无期限 map.put("legal_cert_end_date", merDetail.getLarIdCardPeriodEnd().replace(".", "")); } /***** 法人信息 ******/ @@ -211,10 +216,18 @@ public class LLGMerService { if (banTopCode == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未匹配到结算银行code"); } - map.put("bank_top_code", banTopCode.getBankCode()+""); + map.put("bank_top_code", banTopCode.getBankCode()); map.put("Bank_code", merDetail.getMerSettleAcct().getOpenningBankCode()); - map.put("bank_province", merDetail.getMerSettleAcct().getOpenningBankProvinceName()); - map.put("bank_city", merDetail.getMerSettleAcct().getOpenningBankCityName()); + + String openningBankProvinceName = merDetail.getMerSettleAcct().getOpenningBankProvinceName(); + // 直辖市 + if (openningBankProvinceName.contains("重庆") || openningBankProvinceName.contains("上海") || openningBankProvinceName.contains("天津") || openningBankProvinceName.contains("北京")) { + map.put("bank_province", merDetail.getMerSettleAcct().getOpenningBankProvinceName()); + map.put("bank_city", merDetail.getMerSettleAcct().getOpenningBankProvinceName()); + } else { + map.put("bank_province", merDetail.getMerSettleAcct().getOpenningBankProvinceName()); + map.put("bank_city", merDetail.getMerSettleAcct().getOpenningBankCityName()); + } /***** 结算信息 ******/ /***** 图片资料上传 ******/ @@ -331,4 +344,17 @@ public class LLGMerService { } } + public static void main(String[] args) throws Exception { + // 支付回调 {"bankId":39,"orderId":"ZF1130202401151719195939282104","txnTime":"20240115171957","respMsg":"成功","origTxnAmt":30000,"userId":109,"txnAmt":30000,"respCode":"00","queryId":"20240115171919480173305"} + // String str = "fc6691595307b8504fe61e882fec0ba4b3cf7e679ffda5d262662d51832bc1a2151c946cdd0637680cfb91ad35757672e20454864f63d6e3ecd9ad993f229076269567e109416360bf66fe380f0ffe1100c5857ea69612465fb6c364f25836f29bdf2bbe5a53dfe904b597310b4b3f87f97843fe11070561742271b21c6384fa6852fecaa21fd04d76852030bb935f30b1f2dbc8d19bbf4294595ae8010df9e57236fe51e793789d4acd22265130de7fb9ad268c8e2ed36c85a5941e6fa19e602711d3eef0f7e57d891e4fe773f2c690"; + + // 退款：{"data":{},"status":{"msg":"成功","code":2000}} + String str = "bb269a7ad5d995e103aa98a1b8319382662d191e987c8d1ca7c9ed4929eaebffbdd6338502a2f00f27e9471420d680af0da6bd144d6f6c6a31965cab86fbb54b"; + + + + JSONObject responseData = JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, str)); + System.out.println(responseData.toJSONString()); + } + } diff --git a/service/src/main/java/com/hfkj/channel/llg/service/LLGOrderService.java b/service/src/main/java/com/hfkj/channel/llg/service/LLGOrderService.java index f5b838a..ac522c3 100644 --- a/service/src/main/java/com/hfkj/channel/llg/service/LLGOrderService.java +++ b/service/src/main/java/com/hfkj/channel/llg/service/LLGOrderService.java @@ -16,6 +16,7 @@ import com.hfkj.service.BsTradeOrderService; import com.hfkj.service.period.BsMerPlatformPeriodPaidService; import com.hfkj.service.period.BsMerPlatformPeriodService; import com.hfkj.sysenum.PlatformPeriodTypeEnum; +import com.hfkj.sysenum.PlatformTypeEnum; import com.hfkj.sysenum.TradeOrderRefundStatusEnum; import com.hfkj.sysenum.TradeOrderStatusEnum; import org.apache.commons.lang3.StringUtils; @@ -78,12 +79,14 @@ public class LLGOrderService { if (periodPaid == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未只渠道贴息方式"); } - tradeOrder.setPlatformType(period.getPlatformType()); - tradeOrder.setPlatformMerNo(periodPaid.getPlatformNo()); + tradeOrder.setPlatformType(PlatformTypeEnum.type6.getNumber()); + tradeOrder.setPlatformMerNo(periodPaid.getPlatformMerNo()); + tradeOrder.setPeriodFeePaid(periodPaid.getPlatformFeePaid()); + tradeOrder.setPeriodMerPlatformFeePaidId(periodPaid.getId()); tradeOrderService.editOrder(tradeOrder); Map param = new HashMap<>(); - param.put("merId", periodPaid.getPlatformNo()); + param.put("merId", periodPaid.getPlatformMerNo()); param.put("marketId", periodPaid.getPlatformMarketId()); param.put("pkgId", periodPaid.getPlatformPkgId()); param.put("bankId", tradeOrder.getPeriodBankCode()); @@ -154,8 +157,8 @@ public class LLGOrderService { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseData.getJSONObject("status").getString("msg")); } orderRefund.setTotalAmount(tradeOrder.getTradeActualAmount()); - orderRefund.setRefundAmount(tradeOrder.getRefundPrice()); - orderRefund.setPayerAmount(tradeOrder.getRefundPrice()); + orderRefund.setRefundAmount(orderRefund.getTotalAmount()); + orderRefund.setPayerAmount(orderRefund.getTotalAmount()); orderRefund.setRefundTime(new Date()); orderRefund.setStatus(TradeOrderRefundStatusEnum.status2.getNumber()); tradeOrderRefundService.editOrderRefund(orderRefund); diff --git a/service/src/main/java/com/hfkj/channel/llg/util/HttpsUtils.java b/service/src/main/java/com/hfkj/channel/llg/util/HttpsUtils.java index ddef5e8..41579ca 100644 --- a/service/src/main/java/com/hfkj/channel/llg/util/HttpsUtils.java +++ b/service/src/main/java/com/hfkj/channel/llg/util/HttpsUtils.java @@ -406,7 +406,7 @@ public class HttpsUtils { con.setDoInput(true); int responseCode = con.getResponseCode(); - System.out.println("\nSending 'POST' request to URL : " + url); + System.out.println("\nSending 'GET' request to URL : " + url); System.out.println("Response Code : " + responseCode); BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); diff --git a/service/src/main/java/com/hfkj/config/CommonSysConfig.java b/service/src/main/java/com/hfkj/config/CommonSysConfig.java index 611b0b8..de6be9d 100644 --- a/service/src/main/java/com/hfkj/config/CommonSysConfig.java +++ b/service/src/main/java/com/hfkj/config/CommonSysConfig.java @@ -105,6 +105,16 @@ public class CommonSysConfig { private String lkl_saas_public_key; private String lkl_saas_private_key; + /** + * 【零零购】 请求地址 + */ + private String llg_request_url; + + /** + * 【零零购】 秘钥 + */ + private String llg_key; + /** * 【随行付】天阙请求地址 */ diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java index 5c1c4a5..6388b4f 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java @@ -41,7 +41,8 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt @Insert({ "insert into bs_mer_platform_period (company_id, agent_id, ", "mer_id, mer_no, platform_type, ", - "platform_no, open_unionpay, ", + "platform_no, platform_mer_no, ", + "auth_capital, open_unionpay, ", "unionpay_fee_paid, open_alipay, ", "alipay_fee_paid, agreement_pics, ", "`status`, suggestion_reject, ", @@ -49,7 +50,8 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt "ext_1, ext_2, ext_3)", "values (#{companyId,jdbcType=BIGINT}, #{agentId,jdbcType=BIGINT}, ", "#{merId,jdbcType=BIGINT}, #{merNo,jdbcType=VARCHAR}, #{platformType,jdbcType=INTEGER}, ", - "#{platformNo,jdbcType=VARCHAR}, #{openUnionpay,jdbcType=BIT}, ", + "#{platformNo,jdbcType=VARCHAR}, #{platformMerNo,jdbcType=VARCHAR}, ", + "#{authCapital,jdbcType=DECIMAL}, #{openUnionpay,jdbcType=BIT}, ", "#{unionpayFeePaid,jdbcType=VARCHAR}, #{openAlipay,jdbcType=BIT}, ", "#{alipayFeePaid,jdbcType=INTEGER}, #{agreementPics,jdbcType=VARCHAR}, ", "#{status,jdbcType=INTEGER}, #{suggestionReject,jdbcType=VARCHAR}, ", @@ -72,6 +74,8 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), @Result(column="platform_no", property="platformNo", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_mer_no", property="platformMerNo", jdbcType=JdbcType.VARCHAR), + @Result(column="auth_capital", property="authCapital", jdbcType=JdbcType.DECIMAL), @Result(column="open_unionpay", property="openUnionpay", jdbcType=JdbcType.BIT), @Result(column="unionpay_fee_paid", property="unionpayFeePaid", jdbcType=JdbcType.VARCHAR), @Result(column="open_alipay", property="openAlipay", jdbcType=JdbcType.BIT), @@ -89,9 +93,10 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt @Select({ "select", - "id, company_id, agent_id, mer_id, mer_no, platform_type, platform_no, open_unionpay, ", - "unionpay_fee_paid, open_alipay, alipay_fee_paid, agreement_pics, `status`, suggestion_reject, ", - "create_time, update_time, ext_1, ext_2, ext_3", + "id, company_id, agent_id, mer_id, mer_no, platform_type, platform_no, platform_mer_no, ", + "auth_capital, open_unionpay, unionpay_fee_paid, open_alipay, alipay_fee_paid, ", + "agreement_pics, `status`, suggestion_reject, create_time, update_time, ext_1, ", + "ext_2, ext_3", "from bs_mer_platform_period", "where id = #{id,jdbcType=BIGINT}" }) @@ -103,6 +108,8 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), @Result(column="platform_no", property="platformNo", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_mer_no", property="platformMerNo", jdbcType=JdbcType.VARCHAR), + @Result(column="auth_capital", property="authCapital", jdbcType=JdbcType.DECIMAL), @Result(column="open_unionpay", property="openUnionpay", jdbcType=JdbcType.BIT), @Result(column="unionpay_fee_paid", property="unionpayFeePaid", jdbcType=JdbcType.VARCHAR), @Result(column="open_alipay", property="openAlipay", jdbcType=JdbcType.BIT), @@ -135,6 +142,8 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt "mer_no = #{merNo,jdbcType=VARCHAR},", "platform_type = #{platformType,jdbcType=INTEGER},", "platform_no = #{platformNo,jdbcType=VARCHAR},", + "platform_mer_no = #{platformMerNo,jdbcType=VARCHAR},", + "auth_capital = #{authCapital,jdbcType=DECIMAL},", "open_unionpay = #{openUnionpay,jdbcType=BIT},", "unionpay_fee_paid = #{unionpayFeePaid,jdbcType=VARCHAR},", "open_alipay = #{openAlipay,jdbcType=BIT},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapper.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapper.java index 24fdd62..c951034 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapper.java @@ -42,17 +42,19 @@ public interface BsMerPlatformPeriodPaidMapper extends BsMerPlatformPeriodPaidMa "insert into bs_mer_platform_period_paid (platform_period_id, mer_id, ", "mer_no, pay_type, ", "platform_type, platform_no, ", - "platform_fee_paid, platform_market_id, ", - "platform_pkg_id, current_settle, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", + "platform_mer_no, platform_fee_paid, ", + "platform_market_id, platform_pkg_id, ", + "current_settle, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", "values (#{platformPeriodId,jdbcType=BIGINT}, #{merId,jdbcType=BIGINT}, ", "#{merNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", "#{platformType,jdbcType=INTEGER}, #{platformNo,jdbcType=VARCHAR}, ", - "#{platformFeePaid,jdbcType=INTEGER}, #{platformMarketId,jdbcType=VARCHAR}, ", - "#{platformPkgId,jdbcType=VARCHAR}, #{currentSettle,jdbcType=BIT}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{platformMerNo,jdbcType=VARCHAR}, #{platformFeePaid,jdbcType=INTEGER}, ", + "#{platformMarketId,jdbcType=VARCHAR}, #{platformPkgId,jdbcType=VARCHAR}, ", + "#{currentSettle,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsMerPlatformPeriodPaid record); @@ -70,6 +72,7 @@ public interface BsMerPlatformPeriodPaidMapper extends BsMerPlatformPeriodPaidMa @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), @Result(column="platform_no", property="platformNo", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_mer_no", property="platformMerNo", jdbcType=JdbcType.VARCHAR), @Result(column="platform_fee_paid", property="platformFeePaid", jdbcType=JdbcType.INTEGER), @Result(column="platform_market_id", property="platformMarketId", jdbcType=JdbcType.VARCHAR), @Result(column="platform_pkg_id", property="platformPkgId", jdbcType=JdbcType.VARCHAR), @@ -85,8 +88,8 @@ public interface BsMerPlatformPeriodPaidMapper extends BsMerPlatformPeriodPaidMa @Select({ "select", "id, platform_period_id, mer_id, mer_no, pay_type, platform_type, platform_no, ", - "platform_fee_paid, platform_market_id, platform_pkg_id, current_settle, create_time, ", - "update_time, ext_1, ext_2, ext_3", + "platform_mer_no, platform_fee_paid, platform_market_id, platform_pkg_id, current_settle, ", + "create_time, update_time, ext_1, ext_2, ext_3", "from bs_mer_platform_period_paid", "where id = #{id,jdbcType=BIGINT}" }) @@ -98,6 +101,7 @@ public interface BsMerPlatformPeriodPaidMapper extends BsMerPlatformPeriodPaidMa @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), @Result(column="platform_no", property="platformNo", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_mer_no", property="platformMerNo", jdbcType=JdbcType.VARCHAR), @Result(column="platform_fee_paid", property="platformFeePaid", jdbcType=JdbcType.INTEGER), @Result(column="platform_market_id", property="platformMarketId", jdbcType=JdbcType.VARCHAR), @Result(column="platform_pkg_id", property="platformPkgId", jdbcType=JdbcType.VARCHAR), @@ -127,6 +131,7 @@ public interface BsMerPlatformPeriodPaidMapper extends BsMerPlatformPeriodPaidMa "pay_type = #{payType,jdbcType=INTEGER},", "platform_type = #{platformType,jdbcType=INTEGER},", "platform_no = #{platformNo,jdbcType=VARCHAR},", + "platform_mer_no = #{platformMerNo,jdbcType=VARCHAR},", "platform_fee_paid = #{platformFeePaid,jdbcType=INTEGER},", "platform_market_id = #{platformMarketId,jdbcType=VARCHAR},", "platform_pkg_id = #{platformPkgId,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidSqlProvider.java index 9d16b65..23cba72 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidSqlProvider.java @@ -52,6 +52,10 @@ public class BsMerPlatformPeriodPaidSqlProvider { sql.VALUES("platform_no", "#{platformNo,jdbcType=VARCHAR}"); } + if (record.getPlatformMerNo() != null) { + sql.VALUES("platform_mer_no", "#{platformMerNo,jdbcType=VARCHAR}"); + } + if (record.getPlatformFeePaid() != null) { sql.VALUES("platform_fee_paid", "#{platformFeePaid,jdbcType=INTEGER}"); } @@ -104,6 +108,7 @@ public class BsMerPlatformPeriodPaidSqlProvider { sql.SELECT("pay_type"); sql.SELECT("platform_type"); sql.SELECT("platform_no"); + sql.SELECT("platform_mer_no"); sql.SELECT("platform_fee_paid"); sql.SELECT("platform_market_id"); sql.SELECT("platform_pkg_id"); @@ -158,6 +163,10 @@ public class BsMerPlatformPeriodPaidSqlProvider { sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); } + if (record.getPlatformMerNo() != null) { + sql.SET("platform_mer_no = #{record.platformMerNo,jdbcType=VARCHAR}"); + } + if (record.getPlatformFeePaid() != null) { sql.SET("platform_fee_paid = #{record.platformFeePaid,jdbcType=INTEGER}"); } @@ -209,6 +218,7 @@ public class BsMerPlatformPeriodPaidSqlProvider { sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}"); sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); + sql.SET("platform_mer_no = #{record.platformMerNo,jdbcType=VARCHAR}"); sql.SET("platform_fee_paid = #{record.platformFeePaid,jdbcType=INTEGER}"); sql.SET("platform_market_id = #{record.platformMarketId,jdbcType=VARCHAR}"); sql.SET("platform_pkg_id = #{record.platformPkgId,jdbcType=VARCHAR}"); @@ -252,6 +262,10 @@ public class BsMerPlatformPeriodPaidSqlProvider { sql.SET("platform_no = #{platformNo,jdbcType=VARCHAR}"); } + if (record.getPlatformMerNo() != null) { + sql.SET("platform_mer_no = #{platformMerNo,jdbcType=VARCHAR}"); + } + if (record.getPlatformFeePaid() != null) { sql.SET("platform_fee_paid = #{platformFeePaid,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodSqlProvider.java index 5803b6f..c4563e9 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodSqlProvider.java @@ -52,6 +52,14 @@ public class BsMerPlatformPeriodSqlProvider { sql.VALUES("platform_no", "#{platformNo,jdbcType=VARCHAR}"); } + if (record.getPlatformMerNo() != null) { + sql.VALUES("platform_mer_no", "#{platformMerNo,jdbcType=VARCHAR}"); + } + + if (record.getAuthCapital() != null) { + sql.VALUES("auth_capital", "#{authCapital,jdbcType=DECIMAL}"); + } + if (record.getOpenUnionpay() != null) { sql.VALUES("open_unionpay", "#{openUnionpay,jdbcType=BIT}"); } @@ -116,6 +124,8 @@ public class BsMerPlatformPeriodSqlProvider { sql.SELECT("mer_no"); sql.SELECT("platform_type"); sql.SELECT("platform_no"); + sql.SELECT("platform_mer_no"); + sql.SELECT("auth_capital"); sql.SELECT("open_unionpay"); sql.SELECT("unionpay_fee_paid"); sql.SELECT("open_alipay"); @@ -173,6 +183,14 @@ public class BsMerPlatformPeriodSqlProvider { sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); } + if (record.getPlatformMerNo() != null) { + sql.SET("platform_mer_no = #{record.platformMerNo,jdbcType=VARCHAR}"); + } + + if (record.getAuthCapital() != null) { + sql.SET("auth_capital = #{record.authCapital,jdbcType=DECIMAL}"); + } + if (record.getOpenUnionpay() != null) { sql.SET("open_unionpay = #{record.openUnionpay,jdbcType=BIT}"); } @@ -236,6 +254,8 @@ public class BsMerPlatformPeriodSqlProvider { sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}"); sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); + sql.SET("platform_mer_no = #{record.platformMerNo,jdbcType=VARCHAR}"); + sql.SET("auth_capital = #{record.authCapital,jdbcType=DECIMAL}"); sql.SET("open_unionpay = #{record.openUnionpay,jdbcType=BIT}"); sql.SET("unionpay_fee_paid = #{record.unionpayFeePaid,jdbcType=VARCHAR}"); sql.SET("open_alipay = #{record.openAlipay,jdbcType=BIT}"); @@ -282,6 +302,14 @@ public class BsMerPlatformPeriodSqlProvider { sql.SET("platform_no = #{platformNo,jdbcType=VARCHAR}"); } + if (record.getPlatformMerNo() != null) { + sql.SET("platform_mer_no = #{platformMerNo,jdbcType=VARCHAR}"); + } + + if (record.getAuthCapital() != null) { + sql.SET("auth_capital = #{authCapital,jdbcType=DECIMAL}"); + } + if (record.getOpenUnionpay() != null) { sql.SET("open_unionpay = #{openUnionpay,jdbcType=BIT}"); } diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java index 128787d..31f086a 100644 --- a/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java @@ -71,7 +71,8 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "card_type, `status`, ", "profit_sharing_status, period_status, ", "period_bank_code, period_bank_name, ", - "period_num, pay_time, ", + "period_num, period_fee_paid, ", + "period_mer_platform_fee_paid_id, pay_time, ", "timeout_express, subject, ", "pay_notify_url, attach, ", "special_field, refund_type, ", @@ -112,7 +113,8 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "#{cardType,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{profitSharingStatus,jdbcType=BIT}, #{periodStatus,jdbcType=BIT}, ", "#{periodBankCode,jdbcType=VARCHAR}, #{periodBankName,jdbcType=VARCHAR}, ", - "#{periodNum,jdbcType=INTEGER}, #{payTime,jdbcType=TIMESTAMP}, ", + "#{periodNum,jdbcType=INTEGER}, #{periodFeePaid,jdbcType=INTEGER}, ", + "#{periodMerPlatformFeePaidId,jdbcType=BIGINT}, #{payTime,jdbcType=TIMESTAMP}, ", "#{timeoutExpress,jdbcType=INTEGER}, #{subject,jdbcType=VARCHAR}, ", "#{payNotifyUrl,jdbcType=VARCHAR}, #{attach,jdbcType=VARCHAR}, ", "#{specialField,jdbcType=VARCHAR}, #{refundType,jdbcType=INTEGER}, ", @@ -199,6 +201,8 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { @Result(column="period_bank_code", property="periodBankCode", jdbcType=JdbcType.VARCHAR), @Result(column="period_bank_name", property="periodBankName", jdbcType=JdbcType.VARCHAR), @Result(column="period_num", property="periodNum", jdbcType=JdbcType.INTEGER), + @Result(column="period_fee_paid", property="periodFeePaid", jdbcType=JdbcType.INTEGER), + @Result(column="period_mer_platform_fee_paid_id", property="periodMerPlatformFeePaidId", jdbcType=JdbcType.BIGINT), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="timeout_express", property="timeoutExpress", jdbcType=JdbcType.INTEGER), @Result(column="subject", property="subject", jdbcType=JdbcType.VARCHAR), @@ -234,10 +238,10 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "rebate_activity_actual_price, trade_actual_amount, income_amount, acc_trade_no, ", "acc_settle_amount, acc_mdiscount_amount, acc_discount_amount, shd_fee_amt, fee_rate, ", "settle_amount, settle_date, acc_payment_code, card_type, `status`, profit_sharing_status, ", - "period_status, period_bank_code, period_bank_name, period_num, pay_time, timeout_express, ", - "subject, pay_notify_url, attach, special_field, refund_type, refund_price, create_type, ", - "trans_type, create_time, cancel_time, update_time, request_ip, ext_1, ext_2, ", - "ext_3", + "period_status, period_bank_code, period_bank_name, period_num, period_fee_paid, ", + "period_mer_platform_fee_paid_id, pay_time, timeout_express, subject, pay_notify_url, ", + "attach, special_field, refund_type, refund_price, create_type, trans_type, create_time, ", + "cancel_time, update_time, request_ip, ext_1, ext_2, ext_3", "from bs_trade_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -310,6 +314,8 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { @Result(column="period_bank_code", property="periodBankCode", jdbcType=JdbcType.VARCHAR), @Result(column="period_bank_name", property="periodBankName", jdbcType=JdbcType.VARCHAR), @Result(column="period_num", property="periodNum", jdbcType=JdbcType.INTEGER), + @Result(column="period_fee_paid", property="periodFeePaid", jdbcType=JdbcType.INTEGER), + @Result(column="period_mer_platform_fee_paid_id", property="periodMerPlatformFeePaidId", jdbcType=JdbcType.BIGINT), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="timeout_express", property="timeoutExpress", jdbcType=JdbcType.INTEGER), @Result(column="subject", property="subject", jdbcType=JdbcType.VARCHAR), @@ -408,6 +414,8 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "period_bank_code = #{periodBankCode,jdbcType=VARCHAR},", "period_bank_name = #{periodBankName,jdbcType=VARCHAR},", "period_num = #{periodNum,jdbcType=INTEGER},", + "period_fee_paid = #{periodFeePaid,jdbcType=INTEGER},", + "period_mer_platform_fee_paid_id = #{periodMerPlatformFeePaidId,jdbcType=BIGINT},", "pay_time = #{payTime,jdbcType=TIMESTAMP},", "timeout_express = #{timeoutExpress,jdbcType=INTEGER},", "subject = #{subject,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java index 468b669..32b4241 100644 --- a/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java @@ -296,6 +296,14 @@ public class BsTradeOrderSqlProvider { sql.VALUES("period_num", "#{periodNum,jdbcType=INTEGER}"); } + if (record.getPeriodFeePaid() != null) { + sql.VALUES("period_fee_paid", "#{periodFeePaid,jdbcType=INTEGER}"); + } + + if (record.getPeriodMerPlatformFeePaidId() != null) { + sql.VALUES("period_mer_platform_fee_paid_id", "#{periodMerPlatformFeePaidId,jdbcType=BIGINT}"); + } + if (record.getPayTime() != null) { sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}"); } @@ -441,6 +449,8 @@ public class BsTradeOrderSqlProvider { sql.SELECT("period_bank_code"); sql.SELECT("period_bank_name"); sql.SELECT("period_num"); + sql.SELECT("period_fee_paid"); + sql.SELECT("period_mer_platform_fee_paid_id"); sql.SELECT("pay_time"); sql.SELECT("timeout_express"); sql.SELECT("subject"); @@ -747,6 +757,14 @@ public class BsTradeOrderSqlProvider { sql.SET("period_num = #{record.periodNum,jdbcType=INTEGER}"); } + if (record.getPeriodFeePaid() != null) { + sql.SET("period_fee_paid = #{record.periodFeePaid,jdbcType=INTEGER}"); + } + + if (record.getPeriodMerPlatformFeePaidId() != null) { + sql.SET("period_mer_platform_fee_paid_id = #{record.periodMerPlatformFeePaidId,jdbcType=BIGINT}"); + } + if (record.getPayTime() != null) { sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); } @@ -891,6 +909,8 @@ public class BsTradeOrderSqlProvider { sql.SET("period_bank_code = #{record.periodBankCode,jdbcType=VARCHAR}"); sql.SET("period_bank_name = #{record.periodBankName,jdbcType=VARCHAR}"); sql.SET("period_num = #{record.periodNum,jdbcType=INTEGER}"); + sql.SET("period_fee_paid = #{record.periodFeePaid,jdbcType=INTEGER}"); + sql.SET("period_mer_platform_fee_paid_id = #{record.periodMerPlatformFeePaidId,jdbcType=BIGINT}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); sql.SET("timeout_express = #{record.timeoutExpress,jdbcType=INTEGER}"); sql.SET("subject = #{record.subject,jdbcType=VARCHAR}"); @@ -1186,6 +1206,14 @@ public class BsTradeOrderSqlProvider { sql.SET("period_num = #{periodNum,jdbcType=INTEGER}"); } + if (record.getPeriodFeePaid() != null) { + sql.SET("period_fee_paid = #{periodFeePaid,jdbcType=INTEGER}"); + } + + if (record.getPeriodMerPlatformFeePaidId() != null) { + sql.SET("period_mer_platform_fee_paid_id = #{periodMerPlatformFeePaidId,jdbcType=BIGINT}"); + } + if (record.getPayTime() != null) { sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}"); } diff --git a/service/src/main/java/com/hfkj/dao/LlgBankCodeMapper.java b/service/src/main/java/com/hfkj/dao/LlgBankCodeMapper.java index fb8312d..2def423 100644 --- a/service/src/main/java/com/hfkj/dao/LlgBankCodeMapper.java +++ b/service/src/main/java/com/hfkj/dao/LlgBankCodeMapper.java @@ -41,7 +41,7 @@ public interface LlgBankCodeMapper extends LlgBankCodeMapperExt { @Insert({ "insert into llg_bank_code (bank_code, bank_name, ", "ext_1, ext_2, ext_3)", - "values (#{bankCode,jdbcType=BIGINT}, #{bankName,jdbcType=VARCHAR}, ", + "values (#{bankCode,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") @@ -54,7 +54,7 @@ public interface LlgBankCodeMapper extends LlgBankCodeMapperExt { @SelectProvider(type=LlgBankCodeSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="bank_code", property="bankCode", jdbcType=JdbcType.BIGINT), + @Result(column="bank_code", property="bankCode", jdbcType=JdbcType.VARCHAR), @Result(column="bank_name", property="bankName", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @@ -70,7 +70,7 @@ public interface LlgBankCodeMapper extends LlgBankCodeMapperExt { }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="bank_code", property="bankCode", jdbcType=JdbcType.BIGINT), + @Result(column="bank_code", property="bankCode", jdbcType=JdbcType.VARCHAR), @Result(column="bank_name", property="bankName", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @@ -89,7 +89,7 @@ public interface LlgBankCodeMapper extends LlgBankCodeMapperExt { @Update({ "update llg_bank_code", - "set bank_code = #{bankCode,jdbcType=BIGINT},", + "set bank_code = #{bankCode,jdbcType=VARCHAR},", "bank_name = #{bankName,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/LlgBankCodeSqlProvider.java b/service/src/main/java/com/hfkj/dao/LlgBankCodeSqlProvider.java index 57ed1fa..1198c6b 100644 --- a/service/src/main/java/com/hfkj/dao/LlgBankCodeSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/LlgBankCodeSqlProvider.java @@ -29,7 +29,7 @@ public class LlgBankCodeSqlProvider { sql.INSERT_INTO("llg_bank_code"); if (record.getBankCode() != null) { - sql.VALUES("bank_code", "#{bankCode,jdbcType=BIGINT}"); + sql.VALUES("bank_code", "#{bankCode,jdbcType=VARCHAR}"); } if (record.getBankName() != null) { @@ -85,7 +85,7 @@ public class LlgBankCodeSqlProvider { } if (record.getBankCode() != null) { - sql.SET("bank_code = #{record.bankCode,jdbcType=BIGINT}"); + sql.SET("bank_code = #{record.bankCode,jdbcType=VARCHAR}"); } if (record.getBankName() != null) { @@ -113,7 +113,7 @@ public class LlgBankCodeSqlProvider { sql.UPDATE("llg_bank_code"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("bank_code = #{record.bankCode,jdbcType=BIGINT}"); + sql.SET("bank_code = #{record.bankCode,jdbcType=VARCHAR}"); sql.SET("bank_name = #{record.bankName,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); @@ -129,7 +129,7 @@ public class LlgBankCodeSqlProvider { sql.UPDATE("llg_bank_code"); if (record.getBankCode() != null) { - sql.SET("bank_code = #{bankCode,jdbcType=BIGINT}"); + sql.SET("bank_code = #{bankCode,jdbcType=VARCHAR}"); } if (record.getBankName() != null) { diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java index 4c7534b..a6dd6c6 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java @@ -1,6 +1,7 @@ package com.hfkj.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -48,6 +49,16 @@ public class BsMerPlatformPeriod implements Serializable { */ private String platformNo; + /** + * 平台商户号【过审核后的商户】 + */ + private String platformMerNo; + + /** + * 注册资金 + */ + private BigDecimal authCapital; + /** * 开通银联分期 */ @@ -157,6 +168,22 @@ public class BsMerPlatformPeriod implements Serializable { this.platformNo = platformNo; } + public String getPlatformMerNo() { + return platformMerNo; + } + + public void setPlatformMerNo(String platformMerNo) { + this.platformMerNo = platformMerNo; + } + + public BigDecimal getAuthCapital() { + return authCapital; + } + + public void setAuthCapital(BigDecimal authCapital) { + this.authCapital = authCapital; + } + public Boolean getOpenUnionpay() { return openUnionpay; } @@ -272,6 +299,8 @@ public class BsMerPlatformPeriod implements Serializable { && (this.getMerNo() == null ? other.getMerNo() == null : this.getMerNo().equals(other.getMerNo())) && (this.getPlatformType() == null ? other.getPlatformType() == null : this.getPlatformType().equals(other.getPlatformType())) && (this.getPlatformNo() == null ? other.getPlatformNo() == null : this.getPlatformNo().equals(other.getPlatformNo())) + && (this.getPlatformMerNo() == null ? other.getPlatformMerNo() == null : this.getPlatformMerNo().equals(other.getPlatformMerNo())) + && (this.getAuthCapital() == null ? other.getAuthCapital() == null : this.getAuthCapital().equals(other.getAuthCapital())) && (this.getOpenUnionpay() == null ? other.getOpenUnionpay() == null : this.getOpenUnionpay().equals(other.getOpenUnionpay())) && (this.getUnionpayFeePaid() == null ? other.getUnionpayFeePaid() == null : this.getUnionpayFeePaid().equals(other.getUnionpayFeePaid())) && (this.getOpenAlipay() == null ? other.getOpenAlipay() == null : this.getOpenAlipay().equals(other.getOpenAlipay())) @@ -297,6 +326,8 @@ public class BsMerPlatformPeriod implements Serializable { result = prime * result + ((getMerNo() == null) ? 0 : getMerNo().hashCode()); result = prime * result + ((getPlatformType() == null) ? 0 : getPlatformType().hashCode()); result = prime * result + ((getPlatformNo() == null) ? 0 : getPlatformNo().hashCode()); + result = prime * result + ((getPlatformMerNo() == null) ? 0 : getPlatformMerNo().hashCode()); + result = prime * result + ((getAuthCapital() == null) ? 0 : getAuthCapital().hashCode()); result = prime * result + ((getOpenUnionpay() == null) ? 0 : getOpenUnionpay().hashCode()); result = prime * result + ((getUnionpayFeePaid() == null) ? 0 : getUnionpayFeePaid().hashCode()); result = prime * result + ((getOpenAlipay() == null) ? 0 : getOpenAlipay().hashCode()); @@ -325,6 +356,8 @@ public class BsMerPlatformPeriod implements Serializable { sb.append(", merNo=").append(merNo); sb.append(", platformType=").append(platformType); sb.append(", platformNo=").append(platformNo); + sb.append(", platformMerNo=").append(platformMerNo); + sb.append(", authCapital=").append(authCapital); sb.append(", openUnionpay=").append(openUnionpay); sb.append(", unionpayFeePaid=").append(unionpayFeePaid); sb.append(", openAlipay=").append(openAlipay); diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java index 15aa766..e5c167e 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java @@ -1,5 +1,6 @@ package com.hfkj.entity; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -565,6 +566,136 @@ public class BsMerPlatformPeriodExample { return (Criteria) this; } + public Criteria andPlatformMerNoIsNull() { + addCriterion("platform_mer_no is null"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoIsNotNull() { + addCriterion("platform_mer_no is not null"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoEqualTo(String value) { + addCriterion("platform_mer_no =", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotEqualTo(String value) { + addCriterion("platform_mer_no <>", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoGreaterThan(String value) { + addCriterion("platform_mer_no >", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoGreaterThanOrEqualTo(String value) { + addCriterion("platform_mer_no >=", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoLessThan(String value) { + addCriterion("platform_mer_no <", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoLessThanOrEqualTo(String value) { + addCriterion("platform_mer_no <=", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoLike(String value) { + addCriterion("platform_mer_no like", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotLike(String value) { + addCriterion("platform_mer_no not like", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoIn(List values) { + addCriterion("platform_mer_no in", values, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotIn(List values) { + addCriterion("platform_mer_no not in", values, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoBetween(String value1, String value2) { + addCriterion("platform_mer_no between", value1, value2, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotBetween(String value1, String value2) { + addCriterion("platform_mer_no not between", value1, value2, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andAuthCapitalIsNull() { + addCriterion("auth_capital is null"); + return (Criteria) this; + } + + public Criteria andAuthCapitalIsNotNull() { + addCriterion("auth_capital is not null"); + return (Criteria) this; + } + + public Criteria andAuthCapitalEqualTo(BigDecimal value) { + addCriterion("auth_capital =", value, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalNotEqualTo(BigDecimal value) { + addCriterion("auth_capital <>", value, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalGreaterThan(BigDecimal value) { + addCriterion("auth_capital >", value, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("auth_capital >=", value, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalLessThan(BigDecimal value) { + addCriterion("auth_capital <", value, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalLessThanOrEqualTo(BigDecimal value) { + addCriterion("auth_capital <=", value, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalIn(List values) { + addCriterion("auth_capital in", values, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalNotIn(List values) { + addCriterion("auth_capital not in", values, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("auth_capital between", value1, value2, "authCapital"); + return (Criteria) this; + } + + public Criteria andAuthCapitalNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("auth_capital not between", value1, value2, "authCapital"); + return (Criteria) this; + } + public Criteria andOpenUnionpayIsNull() { addCriterion("open_unionpay is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaid.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaid.java index ed6a4cf..978ca8f 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaid.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaid.java @@ -48,6 +48,11 @@ public class BsMerPlatformPeriodPaid implements Serializable { */ private String platformNo; + /** + * 平台商户号 + */ + private String platformMerNo; + /** * 贴息方式 1：商户贴息 2：用户贴息 3：商户用户各一半 */ @@ -142,6 +147,14 @@ public class BsMerPlatformPeriodPaid implements Serializable { this.platformNo = platformNo; } + public String getPlatformMerNo() { + return platformMerNo; + } + + public void setPlatformMerNo(String platformMerNo) { + this.platformMerNo = platformMerNo; + } + public Integer getPlatformFeePaid() { return platformFeePaid; } @@ -233,6 +246,7 @@ public class BsMerPlatformPeriodPaid implements Serializable { && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) && (this.getPlatformType() == null ? other.getPlatformType() == null : this.getPlatformType().equals(other.getPlatformType())) && (this.getPlatformNo() == null ? other.getPlatformNo() == null : this.getPlatformNo().equals(other.getPlatformNo())) + && (this.getPlatformMerNo() == null ? other.getPlatformMerNo() == null : this.getPlatformMerNo().equals(other.getPlatformMerNo())) && (this.getPlatformFeePaid() == null ? other.getPlatformFeePaid() == null : this.getPlatformFeePaid().equals(other.getPlatformFeePaid())) && (this.getPlatformMarketId() == null ? other.getPlatformMarketId() == null : this.getPlatformMarketId().equals(other.getPlatformMarketId())) && (this.getPlatformPkgId() == null ? other.getPlatformPkgId() == null : this.getPlatformPkgId().equals(other.getPlatformPkgId())) @@ -255,6 +269,7 @@ public class BsMerPlatformPeriodPaid implements Serializable { result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); result = prime * result + ((getPlatformType() == null) ? 0 : getPlatformType().hashCode()); result = prime * result + ((getPlatformNo() == null) ? 0 : getPlatformNo().hashCode()); + result = prime * result + ((getPlatformMerNo() == null) ? 0 : getPlatformMerNo().hashCode()); result = prime * result + ((getPlatformFeePaid() == null) ? 0 : getPlatformFeePaid().hashCode()); result = prime * result + ((getPlatformMarketId() == null) ? 0 : getPlatformMarketId().hashCode()); result = prime * result + ((getPlatformPkgId() == null) ? 0 : getPlatformPkgId().hashCode()); @@ -280,6 +295,7 @@ public class BsMerPlatformPeriodPaid implements Serializable { sb.append(", payType=").append(payType); sb.append(", platformType=").append(platformType); sb.append(", platformNo=").append(platformNo); + sb.append(", platformMerNo=").append(platformMerNo); sb.append(", platformFeePaid=").append(platformFeePaid); sb.append(", platformMarketId=").append(platformMarketId); sb.append(", platformPkgId=").append(platformPkgId); diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaidExample.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaidExample.java index fb5caca..3c24281 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaidExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaidExample.java @@ -565,6 +565,76 @@ public class BsMerPlatformPeriodPaidExample { return (Criteria) this; } + public Criteria andPlatformMerNoIsNull() { + addCriterion("platform_mer_no is null"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoIsNotNull() { + addCriterion("platform_mer_no is not null"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoEqualTo(String value) { + addCriterion("platform_mer_no =", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotEqualTo(String value) { + addCriterion("platform_mer_no <>", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoGreaterThan(String value) { + addCriterion("platform_mer_no >", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoGreaterThanOrEqualTo(String value) { + addCriterion("platform_mer_no >=", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoLessThan(String value) { + addCriterion("platform_mer_no <", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoLessThanOrEqualTo(String value) { + addCriterion("platform_mer_no <=", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoLike(String value) { + addCriterion("platform_mer_no like", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotLike(String value) { + addCriterion("platform_mer_no not like", value, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoIn(List values) { + addCriterion("platform_mer_no in", values, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotIn(List values) { + addCriterion("platform_mer_no not in", values, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoBetween(String value1, String value2) { + addCriterion("platform_mer_no between", value1, value2, "platformMerNo"); + return (Criteria) this; + } + + public Criteria andPlatformMerNoNotBetween(String value1, String value2) { + addCriterion("platform_mer_no not between", value1, value2, "platformMerNo"); + return (Criteria) this; + } + public Criteria andPlatformFeePaidIsNull() { addCriterion("platform_fee_paid is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/BsTradeOrder.java b/service/src/main/java/com/hfkj/entity/BsTradeOrder.java index a432994..752d31b 100644 --- a/service/src/main/java/com/hfkj/entity/BsTradeOrder.java +++ b/service/src/main/java/com/hfkj/entity/BsTradeOrder.java @@ -358,6 +358,16 @@ public class BsTradeOrder implements Serializable { */ private Integer periodNum; + /** + * 贴息方式 1：商户贴息 2：用户贴息 3：商户用户各一半 + */ + private Integer periodFeePaid; + + /** + * 贴息活动id + */ + private Long periodMerPlatformFeePaidId; + /** * 支付时间 */ @@ -980,6 +990,22 @@ public class BsTradeOrder implements Serializable { this.periodNum = periodNum; } + public Integer getPeriodFeePaid() { + return periodFeePaid; + } + + public void setPeriodFeePaid(Integer periodFeePaid) { + this.periodFeePaid = periodFeePaid; + } + + public Long getPeriodMerPlatformFeePaidId() { + return periodMerPlatformFeePaidId; + } + + public void setPeriodMerPlatformFeePaidId(Long periodMerPlatformFeePaidId) { + this.periodMerPlatformFeePaidId = periodMerPlatformFeePaidId; + } + public Date getPayTime() { return payTime; } @@ -1196,6 +1222,8 @@ public class BsTradeOrder implements Serializable { && (this.getPeriodBankCode() == null ? other.getPeriodBankCode() == null : this.getPeriodBankCode().equals(other.getPeriodBankCode())) && (this.getPeriodBankName() == null ? other.getPeriodBankName() == null : this.getPeriodBankName().equals(other.getPeriodBankName())) && (this.getPeriodNum() == null ? other.getPeriodNum() == null : this.getPeriodNum().equals(other.getPeriodNum())) + && (this.getPeriodFeePaid() == null ? other.getPeriodFeePaid() == null : this.getPeriodFeePaid().equals(other.getPeriodFeePaid())) + && (this.getPeriodMerPlatformFeePaidId() == null ? other.getPeriodMerPlatformFeePaidId() == null : this.getPeriodMerPlatformFeePaidId().equals(other.getPeriodMerPlatformFeePaidId())) && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) && (this.getTimeoutExpress() == null ? other.getTimeoutExpress() == null : this.getTimeoutExpress().equals(other.getTimeoutExpress())) && (this.getSubject() == null ? other.getSubject() == null : this.getSubject().equals(other.getSubject())) @@ -1287,6 +1315,8 @@ public class BsTradeOrder implements Serializable { result = prime * result + ((getPeriodBankCode() == null) ? 0 : getPeriodBankCode().hashCode()); result = prime * result + ((getPeriodBankName() == null) ? 0 : getPeriodBankName().hashCode()); result = prime * result + ((getPeriodNum() == null) ? 0 : getPeriodNum().hashCode()); + result = prime * result + ((getPeriodFeePaid() == null) ? 0 : getPeriodFeePaid().hashCode()); + result = prime * result + ((getPeriodMerPlatformFeePaidId() == null) ? 0 : getPeriodMerPlatformFeePaidId().hashCode()); result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); result = prime * result + ((getTimeoutExpress() == null) ? 0 : getTimeoutExpress().hashCode()); result = prime * result + ((getSubject() == null) ? 0 : getSubject().hashCode()); @@ -1381,6 +1411,8 @@ public class BsTradeOrder implements Serializable { sb.append(", periodBankCode=").append(periodBankCode); sb.append(", periodBankName=").append(periodBankName); sb.append(", periodNum=").append(periodNum); + sb.append(", periodFeePaid=").append(periodFeePaid); + sb.append(", periodMerPlatformFeePaidId=").append(periodMerPlatformFeePaidId); sb.append(", payTime=").append(payTime); sb.append(", timeoutExpress=").append(timeoutExpress); sb.append(", subject=").append(subject); diff --git a/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java b/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java index 8c77345..21d93e9 100644 --- a/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java +++ b/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java @@ -4473,6 +4473,126 @@ public class BsTradeOrderExample { return (Criteria) this; } + public Criteria andPeriodFeePaidIsNull() { + addCriterion("period_fee_paid is null"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidIsNotNull() { + addCriterion("period_fee_paid is not null"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidEqualTo(Integer value) { + addCriterion("period_fee_paid =", value, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidNotEqualTo(Integer value) { + addCriterion("period_fee_paid <>", value, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidGreaterThan(Integer value) { + addCriterion("period_fee_paid >", value, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidGreaterThanOrEqualTo(Integer value) { + addCriterion("period_fee_paid >=", value, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidLessThan(Integer value) { + addCriterion("period_fee_paid <", value, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidLessThanOrEqualTo(Integer value) { + addCriterion("period_fee_paid <=", value, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidIn(List values) { + addCriterion("period_fee_paid in", values, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidNotIn(List values) { + addCriterion("period_fee_paid not in", values, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidBetween(Integer value1, Integer value2) { + addCriterion("period_fee_paid between", value1, value2, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodFeePaidNotBetween(Integer value1, Integer value2) { + addCriterion("period_fee_paid not between", value1, value2, "periodFeePaid"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdIsNull() { + addCriterion("period_mer_platform_fee_paid_id is null"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdIsNotNull() { + addCriterion("period_mer_platform_fee_paid_id is not null"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdEqualTo(Long value) { + addCriterion("period_mer_platform_fee_paid_id =", value, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdNotEqualTo(Long value) { + addCriterion("period_mer_platform_fee_paid_id <>", value, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdGreaterThan(Long value) { + addCriterion("period_mer_platform_fee_paid_id >", value, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdGreaterThanOrEqualTo(Long value) { + addCriterion("period_mer_platform_fee_paid_id >=", value, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdLessThan(Long value) { + addCriterion("period_mer_platform_fee_paid_id <", value, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdLessThanOrEqualTo(Long value) { + addCriterion("period_mer_platform_fee_paid_id <=", value, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdIn(List values) { + addCriterion("period_mer_platform_fee_paid_id in", values, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdNotIn(List values) { + addCriterion("period_mer_platform_fee_paid_id not in", values, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdBetween(Long value1, Long value2) { + addCriterion("period_mer_platform_fee_paid_id between", value1, value2, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + + public Criteria andPeriodMerPlatformFeePaidIdNotBetween(Long value1, Long value2) { + addCriterion("period_mer_platform_fee_paid_id not between", value1, value2, "periodMerPlatformFeePaidId"); + return (Criteria) this; + } + public Criteria andPayTimeIsNull() { addCriterion("pay_time is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/LlgBankCode.java b/service/src/main/java/com/hfkj/entity/LlgBankCode.java index 88d1dfe..a8bcaab 100644 --- a/service/src/main/java/com/hfkj/entity/LlgBankCode.java +++ b/service/src/main/java/com/hfkj/entity/LlgBankCode.java @@ -20,7 +20,7 @@ public class LlgBankCode implements Serializable { /** * 银行代码 */ - private Long bankCode; + private String bankCode; /** * 银行名称 @@ -43,11 +43,11 @@ public class LlgBankCode implements Serializable { this.id = id; } - public Long getBankCode() { + public String getBankCode() { return bankCode; } - public void setBankCode(Long bankCode) { + public void setBankCode(String bankCode) { this.bankCode = bankCode; } diff --git a/service/src/main/java/com/hfkj/entity/LlgBankCodeExample.java b/service/src/main/java/com/hfkj/entity/LlgBankCodeExample.java index 383b762..b9274d5 100644 --- a/service/src/main/java/com/hfkj/entity/LlgBankCodeExample.java +++ b/service/src/main/java/com/hfkj/entity/LlgBankCodeExample.java @@ -194,52 +194,62 @@ public class LlgBankCodeExample { return (Criteria) this; } - public Criteria andBankCodeEqualTo(Long value) { + public Criteria andBankCodeEqualTo(String value) { addCriterion("bank_code =", value, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeNotEqualTo(Long value) { + public Criteria andBankCodeNotEqualTo(String value) { addCriterion("bank_code <>", value, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeGreaterThan(Long value) { + public Criteria andBankCodeGreaterThan(String value) { addCriterion("bank_code >", value, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeGreaterThanOrEqualTo(Long value) { + public Criteria andBankCodeGreaterThanOrEqualTo(String value) { addCriterion("bank_code >=", value, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeLessThan(Long value) { + public Criteria andBankCodeLessThan(String value) { addCriterion("bank_code <", value, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeLessThanOrEqualTo(Long value) { + public Criteria andBankCodeLessThanOrEqualTo(String value) { addCriterion("bank_code <=", value, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeIn(List values) { + public Criteria andBankCodeLike(String value) { + addCriterion("bank_code like", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeNotLike(String value) { + addCriterion("bank_code not like", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeIn(List values) { addCriterion("bank_code in", values, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeNotIn(List values) { + public Criteria andBankCodeNotIn(List values) { addCriterion("bank_code not in", values, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeBetween(Long value1, Long value2) { + public Criteria andBankCodeBetween(String value1, String value2) { addCriterion("bank_code between", value1, value2, "bankCode"); return (Criteria) this; } - public Criteria andBankCodeNotBetween(Long value1, Long value2) { + public Criteria andBankCodeNotBetween(String value1, String value2) { addCriterion("bank_code not between", value1, value2, "bankCode"); return (Criteria) this; } diff --git a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderRefundServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderRefundServiceImpl.java index bc64f5b..3fccc82 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderRefundServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderRefundServiceImpl.java @@ -152,7 +152,7 @@ public class BsTradeOrderRefundServiceImpl implements BsTradeOrderRefundService @Override public BsTradeOrderRefund getRefundByOutTradeOrder(String outTradeOrder) { BsTradeOrderRefundExample example = new BsTradeOrderRefundExample(); - example.createCriteria().andOutTradeNoEqualTo(outTradeOrder); + example.createCriteria().andOutTradeNoEqualTo(outTradeOrder).andStatusNotEqualTo(TradeOrderRefundStatusEnum.status0.getNumber()); List list = tradeOrderRefundMapper.selectByExample(example); if (list.size() > 0) { return list.get(0); diff --git a/service/src/main/resources/dev/commonConfig.properties b/service/src/main/resources/dev/commonConfig.properties index a90b75d..b2b839c 100644 --- a/service/src/main/resources/dev/commonConfig.properties +++ b/service/src/main/resources/dev/commonConfig.properties @@ -24,6 +24,9 @@ lkl_mer_contract_ret_url=https://gratia-pay.dctpay.com/brest/laKaLaNotify/merCon lkl_micro_pay_ret_url=https://gratia-pay.dctpay.com/crest/laKaLaNotify/microPay lkl_open_api_pay_notify_url=https://gratia-pay.dctpay.com/openApi/v1/payNotify/lakala +llg_request_url=https://abcd.zjdt.cc +llg_key=BMKp20Omcv9u7TqGAhydCw63 + # lkl_saas_client_id=testsit # lkl_saas_client_secret=EguwEckByf2I6u6z # lkl_saas_activity_id=37 diff --git a/service/src/main/resources/prod-9606/commonConfig.properties b/service/src/main/resources/prod-9606/commonConfig.properties index eb8999a..82dd9fb 100644 --- a/service/src/main/resources/prod-9606/commonConfig.properties +++ b/service/src/main/resources/prod-9606/commonConfig.properties @@ -45,6 +45,10 @@ tianque_public_key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjo1+KBcvwDSIo+nMY tianque_micro_pay_ret_url=https://pay.dctpay.com/crest/tianqueNotify/microPay tianque_open_api_pay_notify_url=https://pay.dctpay.com/openApi/v1/payNotify/tianque +# LingLingGou config +llg_request_url=https://abcd.zjdt.cc +llg_key=BMKp20Omcv9u7TqGAhydCw63 + wechat_pay_notify_url=https://pay.dctpay.com/crest/weiXinNotify/jsapiPay file_url=/home/project/gratia-pay/file diff --git a/service/src/main/resources/prod/commonConfig.properties b/service/src/main/resources/prod/commonConfig.properties index 5350723..14bf82d 100644 --- a/service/src/main/resources/prod/commonConfig.properties +++ b/service/src/main/resources/prod/commonConfig.properties @@ -45,6 +45,10 @@ tianque_public_key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjo1+KBcvwDSIo+nMY tianque_micro_pay_ret_url=https://pay.dctpay.com/crest/tianqueNotify/microPay tianque_open_api_pay_notify_url=https://pay.dctpay.com/openApi/v1/payNotify/tianque +# LingLingGou config +llg_request_url=https://abcd.zjdt.cc +llg_key=BMKp20Omcv9u7TqGAhydCw63 + wechat_pay_notify_url=https://pay.dctpay.com/crest/weiXinNotify/jsapiPay file_url=/home/project/gratia-pay/file