diff --git a/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java b/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java index c5c7166..93c3f35 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerPlatformPeriodController.java @@ -1,15 +1,20 @@ package com.cweb.controller; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.utils.ResponseMsgUtil; +import com.hfkj.entity.BsMer; import com.hfkj.entity.BsMerPlatformPeriod; +import com.hfkj.entity.BsMerPlatformPeriodPaid; +import com.hfkj.entity.BsMerPlatformPeriodRate; import com.hfkj.model.ResponseData; -import com.hfkj.service.BsMerPlatformNoService; +import com.hfkj.service.BsMerService; +import com.hfkj.service.period.BsMerPlatformPeriodPaidService; +import com.hfkj.service.period.BsMerPlatformPeriodRateService; import com.hfkj.service.period.BsMerPlatformPeriodService; +import com.hfkj.sysenum.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -19,8 +24,11 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @className: BsMerPlatformPeriodController @@ -28,7 +36,7 @@ import java.util.Map; * @date: 2024/1/6 **/ @Controller -@Api(value = "商户分账渠道管理") +@Api(value = "商户分期渠道管理") @RequestMapping(value = "/merPlatformPeriod") public class BsMerPlatformPeriodController { @@ -36,6 +44,12 @@ public class BsMerPlatformPeriodController { @Resource private BsMerPlatformPeriodService merPlatformPeriodService; + @Resource + private BsMerPlatformPeriodPaidService merPlatformPeriodPaidService; + @Resource + private BsMerPlatformPeriodRateService merPlatformPeriodRateService; + @Resource + private BsMerService merService; @RequestMapping(value="/apply",method = RequestMethod.POST) @ResponseBody @@ -46,25 +60,217 @@ public class BsMerPlatformPeriodController { || StringUtils.isBlank(body.getString("merNo")) || body.getInteger("platformPeriodType") == null || body.getBoolean("openUnionpay") == null - || body.getString("unionpayFeePaid") == null - || body.getJSONObject("rateObj") == null) { + || StringUtils.isBlank(body.getString("agreementPics")) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + // 查询商户 + BsMer mer = merService.getMer(body.getString("merNo")); + if (mer == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商户"); } - JSONObject rateObj = body.getJSONObject("rateObj"); - for (Object obj : rateObj.getJSONArray("")) { - if () { + // 查询记录 + BsMerPlatformPeriod merPlatformPeriod = merPlatformPeriodService.getDetailByMer(mer.getMerNo(), PlatformPeriodTypeEnum.getDataByNumber(body.getInteger("platformPeriodType"))); + if (merPlatformPeriod != null && !merPlatformPeriod.getStatus().equals(MerPlatformPeriodStatusEnum.status3.getNumber())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "状态错误,无法多次申请"); + } + if (merPlatformPeriod == null) { + merPlatformPeriod = new BsMerPlatformPeriod(); + } + + merPlatformPeriod.setCompanyId(mer.getCompanyId()); + merPlatformPeriod.setAgentId(mer.getAgentId()); + merPlatformPeriod.setMerId(mer.getId()); + merPlatformPeriod.setMerNo(mer.getMerNo()); + merPlatformPeriod.setPlatformType(body.getInteger("platformPeriodType")); + merPlatformPeriod.setOpenUnionpay(body.getBoolean("openUnionpay")); + merPlatformPeriod.setOpenAlipay(false); + merPlatformPeriod.setStatus(MerPlatformPeriodStatusEnum.status2.getNumber()); + merPlatformPeriod.setSuggestionReject(null); + merPlatformPeriod.setAgreementPics(body.getString("agreementPics")); + + List periodPaidList = new ArrayList<>(); + List periodRateList = new ArrayList<>(); + BsMerPlatformPeriodRate periodRate; + // 开通银联分期 + if (body.getBoolean("openUnionpay") == true) { + if (StringUtils.isBlank(body.getString("unionpayFeePaid"))) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未上传银联贴息方式"); + } + if (body.getJSONArray("unionpayRate1") == null || body.getJSONArray("unionpayRate2") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未上传费率"); + } + + // 贴息方式 + merPlatformPeriod.setUnionpayFeePaid(body.getString("unionpayFeePaid")); + String[] feePaidArray = merPlatformPeriod.getUnionpayFeePaid().split(","); + for (String feePaid : feePaidArray) { + BsMerPlatformPeriodPaid merPlatformPeriodPaid = new BsMerPlatformPeriodPaid(); + merPlatformPeriodPaid.setMerId(merPlatformPeriod.getMerId()); + merPlatformPeriodPaid.setMerNo(merPlatformPeriod.getMerNo()); + merPlatformPeriodPaid.setPayType(MerPlatformPeriodPayTypeEnum.type1.getNumber()); + merPlatformPeriodPaid.setPlatformType(merPlatformPeriod.getPlatformType()); + merPlatformPeriodPaid.setPlatformFeePaid(MerPlatformPeriodFeePaidTypeEnum.getDataByNumber(Integer.valueOf(feePaid)).getNumber()); + merPlatformPeriodPaid.setCurrentSettle(periodPaidList.stream().filter(o -> o.getPlatformType() != null).collect(Collectors.toList()).isEmpty()?true:false); + periodPaidList.add(merPlatformPeriodPaid); + } + + // 银联分期费率(1类银行) + for (Object obj : body.getJSONArray("unionpayRate1")) { + JSONObject unionpayRateObj = (JSONObject) obj; + if (unionpayRateObj == null + || unionpayRateObj.getInteger("periodNum") == null + || unionpayRateObj.getBigDecimal("rate") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "费率请求校验失败"); + } + periodRate = new BsMerPlatformPeriodRate(); + periodRate.setPeriodRateType(MerPlatformPeriodRateTypeEnum.type1.getNumber()); + periodRate.setPeriodNum(unionpayRateObj.getInteger("periodNum")); + periodRate.setRate(unionpayRateObj.getBigDecimal("rate")); + periodRateList.add(periodRate); + } + + // 银联分期费率(2类银行) + for (Object obj : body.getJSONArray("unionpayRate2")) { + JSONObject unionpayRateObj = (JSONObject) obj; + if (unionpayRateObj == null + || unionpayRateObj.getInteger("periodNum") == null + || unionpayRateObj.getBigDecimal("rate") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "费率请求校验失败"); + } + periodRate = new BsMerPlatformPeriodRate(); + periodRate.setPeriodRateType(MerPlatformPeriodRateTypeEnum.type2.getNumber()); + periodRate.setPeriodNum(unionpayRateObj.getInteger("periodNum")); + periodRate.setRate(unionpayRateObj.getBigDecimal("rate")); + periodRateList.add(periodRate); } } - merPlatformPeriodService.apply(); + merPlatformPeriodService.configPeriod(merPlatformPeriod, periodPaidList, periodRateList); - return ResponseMsgUtil.success(); + return ResponseMsgUtil.success("申请成功"); } catch (Exception e) { log.error(e.getMessage(), e); return ResponseMsgUtil.exception(e); } } + + @RequestMapping(value="/updateFeePaid",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "修改贴息方式") + public ResponseData updateFeePaid(@RequestBody JSONObject body) { + try { + if (body == null + || StringUtils.isBlank(body.getString("merNo")) + || body.getInteger("platformPeriodType") == null + || body.getInteger("payType") == null + || body.getInteger("feePaid") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + merPlatformPeriodService.updateFeePaid( + body.getString("merNo"), + PlatformPeriodTypeEnum.getDataByNumber(body.getInteger("platformPeriodType")), + MerPlatformPeriodPayTypeEnum.getDataByNumber(body.getInteger("payType")), + MerPlatformPeriodFeePaidTypeEnum.getDataByNumber(body.getInteger("feePaid")) + ); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getMerPlatformPeriodDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询商户详情") + public ResponseData getMerPlatformPeriodDetail(@RequestParam(value = "merNo" , required = true) String merNo) { + try { + + List> list = new ArrayList<>(); + Map platformPeriodTypeMap = new HashMap<>(); + + // 渠道平台 + for (PlatformPeriodTypeEnum platformPeriodTypeEnum : PlatformPeriodTypeEnum.values()) { + platformPeriodTypeMap.put("platformType", platformPeriodTypeEnum.getNumber()); + platformPeriodTypeMap.put("platformTypeName", platformPeriodTypeEnum.getName()); + + // 查询渠道平台资料 + BsMerPlatformPeriod period = merPlatformPeriodService.getDetailByMer(merNo, platformPeriodTypeEnum); + if (period != null) { + platformPeriodTypeMap.put("platformPeriod", period); + platformPeriodTypeMap.put("unionpayRate1", merPlatformPeriodRateService.getList(period.getId(), MerPlatformPeriodRateTypeEnum.type1)); + platformPeriodTypeMap.put("unionpayRate2", merPlatformPeriodRateService.getList(period.getId(), MerPlatformPeriodRateTypeEnum.type2)); + } else { + platformPeriodTypeMap.put("platformPeriod", null); + platformPeriodTypeMap.put("unionpayRate1", null); + platformPeriodTypeMap.put("unionpayRate2", null); + } + list.add(platformPeriodTypeMap); + } + + return ResponseMsgUtil.success(list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getFeePaidList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询商户贴息列表") + public ResponseData getFeePaidList(@RequestParam(value = "merNo" , required = true) String merNo) { + try { + + List> list = new ArrayList<>(); + + Map platformPeriodTypeMap = new HashMap<>(); + + // 渠道平台 + PlatformPeriodTypeEnum[] platformPeriodTypeList = PlatformPeriodTypeEnum.values(); + for (PlatformPeriodTypeEnum platformPeriodTypeEnum : platformPeriodTypeList) { + platformPeriodTypeMap.put("platformType", platformPeriodTypeEnum.getNumber()); + platformPeriodTypeMap.put("platformTypeName", platformPeriodTypeEnum.getName()); + platformPeriodTypeMap.put("platformPeriod", merPlatformPeriodService.getDetailByMer(merNo, platformPeriodTypeEnum)); + + List> payTypeListMap = new ArrayList<>(); + // 分期支付方式 + MerPlatformPeriodPayTypeEnum[] periodPayType = MerPlatformPeriodPayTypeEnum.values(); + for (MerPlatformPeriodPayTypeEnum payType : periodPayType) { + Map payTypeMap = new HashMap<>(); + payTypeMap.put("payType", payType.getNumber()); + payTypeMap.put("payTypeName", payType.getName()); + + List> paidListMap = new ArrayList<>(); + // 查询贴息方式 + List paidList = merPlatformPeriodPaidService.getList(merNo, PlatformPeriodTypeEnum.getDataByNumber(platformPeriodTypeEnum.getNumber())); + for (BsMerPlatformPeriodPaid paid : paidList) { + Map paidMap = new HashMap<>(); + paidMap.put("feePaid", paid.getPlatformFeePaid()); + paidMap.put("currentSettle", paid.getCurrentSettle()); + paidListMap.add(paidMap); + } + payTypeMap.put("feePaidList", paidListMap); + payTypeListMap.add(payTypeMap); + } + + platformPeriodTypeMap.put("payTypeList", payTypeListMap); + list.add(platformPeriodTypeMap); + } + return ResponseMsgUtil.success(list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + } diff --git a/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java b/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java index 1c044fe..7cab20c 100644 --- a/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java +++ b/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java @@ -8,10 +8,12 @@ import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.common.utils.StreamUtil; +import com.hfkj.entity.BsMer; import com.hfkj.entity.BsPayQrCode; import com.hfkj.entity.BsStore; import com.hfkj.entity.BsStoreDiscountActivity; import com.hfkj.model.ResponseData; +import com.hfkj.service.BsMerService; import com.hfkj.service.BsPayQrCodeService; import com.hfkj.service.BsStoreDiscountActivityService; import com.hfkj.service.BsStoreService; @@ -44,7 +46,8 @@ public class BsPayQrCodeController { @Resource private BsStoreService storeService; - + @Resource + private BsMerService merService; @Resource private BsStoreDiscountActivityService storeDiscountActivityService; @@ -91,6 +94,17 @@ public class BsPayQrCodeController { storeMap.put("storeName", store.getName()); param.put("store", storeMap); + // 查询商户 + BsMer mer = merService.getMer(store.getMerId()); + if (mer == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商户"); + } + Map merMap = new HashMap<>(); + merMap.put("merNo", mer.getMerNo()); + merMap.put("merName", mer.getMerName()); + merMap.put("periodStatus", mer.getPeriodStatus()); + param.put("mer", merMap); + List discountActivityList = new ArrayList<>(); // 门店优惠 diff --git a/cweb/src/main/java/com/cweb/notify/LLGController.java b/cweb/src/main/java/com/cweb/notify/LLGController.java index 97d7e00..6654906 100644 --- a/cweb/src/main/java/com/cweb/notify/LLGController.java +++ b/cweb/src/main/java/com/cweb/notify/LLGController.java @@ -8,6 +8,8 @@ import com.hfkj.channel.llg.util.AesUtil; import com.hfkj.config.CommonSysConst; import com.hfkj.entity.*; import com.hfkj.service.*; +import com.hfkj.service.period.BsMerPlatformPeriodPaidService; +import com.hfkj.service.period.BsMerPlatformPeriodService; import com.hfkj.sysenum.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,17 +47,12 @@ public class LLGController { @Resource private BsTradeOrderMsgService tradeOrderMsgService; @Resource - private BsMerLedgerService merLedgerService; + private BsMerPlatformPeriodService merPlatformPeriodService; @Resource - private BsMerLedgerApplyService merLedgerApplyService; + private BsMerPlatformPeriodPaidService merPlatformPeriodPaidService; @Resource - private BsMerLedgerReceiverService merLedgerReceiverService; - @Resource - private BsMerLedgerReceiverApplyService merLedgerReceiverApplyService; - @Resource - private LaKaLaLedgerService laKaLaLedgerService; - @Resource - private LaKaLaWalletService laKaLaWalletService; + private BsMerService merService; + @RequestMapping(value="/trade",method = RequestMethod.POST) @ResponseBody @@ -100,139 +97,70 @@ public class LLGController { } } - @RequestMapping(value="/applyLedgerMer",method = RequestMethod.POST) + @RequestMapping(value="/merApply",method = RequestMethod.POST) @ResponseBody - @ApiOperation(value = "开通分账业务通知") - public void applyLedgerMer(@RequestBody String reqBody) { + @ApiOperation(value = "商户申请开通审核通知") + public void merApply(@RequestBody String reqBody) { try { - log.info("开通分账业务通知", reqBody); + log.info("商户申请开通审核通知", reqBody); System.out.println(reqBody); JSONObject respData = JSONObject.parseObject(reqBody); - - BsMerLedgerApply ledgerApply = merLedgerApplyService.getApplyByApplyId(respData.getString("applyId")); - if (ledgerApply != null) { - ledgerApply.setNotifyBody(reqBody); - merLedgerApplyService.editMerLedgerApply(ledgerApply); - - // 查询商户分账信息 - BsMerLedger merLedger = merLedgerService.getMerLedgerById(ledgerApply.getMerLedgerId()); - if (merLedger != null) { - // 审核状态 1:通过,2拒绝 - if (respData.getString("auditStatus").equals("1")) { - merLedger.setStatus(MerLedgerStatusEnum.status1.getNumber()); - merLedgerService.editMerLedger(merLedger); - // 延迟3秒 - Thread.sleep(3000); - - // 提现通知地址 - String notifyUrl = CommonSysConst.getSysConfig().getDomainName()+"/crest/merWithdrawal/notify?cupNo="+merLedger.getCupNo(); - - // 配置账户自动结算 - laKaLaWalletService.ewalletSettleProfile(1,merLedger.getCupNo(), "02", "06", notifyUrl); - - // 配置分账接收方账户自动结算 - laKaLaWalletService.ewalletSettleProfile(2,merLedger.getReceiverNo(), "02", "06", notifyUrl); - - } else { - merLedger.setStatus(MerLedgerStatusEnum.status3.getNumber()); - merLedger.setRejectReason(respData.getString("remark")); - merLedgerService.editMerLedger(merLedger); + // 示例:{"application_form_id":3878,"mer_id":"0","result":"图片模糊,请重新上传","status":"3"} + + 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()); + merPlatformPeriodService.editData(period); + + // 查询商户 + BsMer mer = merService.getMer(period.getMerId()); + if (mer != null) { + mer.setPeriodStatus(true); + merService.update(mer); } - } - } - - } catch (Exception e) { - log.error("login error!",e); - } - - } - - @RequestMapping(value="/applyBindReceiver",method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "分账关系绑定申请") - public void applyBindReceiver(@RequestBody String reqBody) { - try { - log.info("分账关系绑定申请通知", reqBody); - System.out.println(reqBody); - - JSONObject respData = JSONObject.parseObject(reqBody); - - // 分手接收方申请记录 - BsMerLedgerReceiverApply receiverApply = merLedgerReceiverApplyService.getReceiverApplyByApplyId(respData.getString("applyId")); - if (receiverApply != null) { - receiverApply.setNotifyBody(reqBody); - // 1:通过,2拒绝 - receiverApply.setStatus( - respData.getString("auditStatus").equals("1") - ?MerLedgerReceiverApplyStatusEnum.status2.getNumber() - :MerLedgerReceiverApplyStatusEnum.status3.getNumber()); - receiverApply.setRejectReason(respData.getString("remark")); - merLedgerReceiverApplyService.editReceiverApply(receiverApply); - - // 分账接收方 - BsMerLedgerReceiver ledgerReceiver = merLedgerReceiverService.getMerLedgerReceiver(receiverApply.getMerId(), receiverApply.getReceiverNo()); - if (ledgerReceiver != null) { - ledgerReceiver.setStatus( - receiverApply.getStatus().equals( - MerLedgerReceiverApplyStatusEnum.status2.getNumber()) - ?MerLedgerReceiverStatusEnum.status1.getNumber() - :MerLedgerReceiverStatusEnum.status2.getNumber() - ); - ledgerReceiver.setAuditStatus( - receiverApply.getStatus().equals(MerLedgerReceiverApplyStatusEnum.status2.getNumber()) - ?MerLedgerReceiverAuditStatusEnum.status2.getNumber() - :MerLedgerReceiverAuditStatusEnum.status3.getNumber() - ); - ledgerReceiver.setRejectReason(receiverApply.getRejectReason()); - merLedgerReceiverService.editMerLedgerReceiver(ledgerReceiver); - } - } - - } catch (Exception e) { - log.error("login error!",e); - } - } + 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); + } + } - @RequestMapping(value="/applyBindUnReceiver",method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "分账关系绑定申请") - public void applyBindUnReceiver(@RequestBody String reqBody) { - try { - log.info("分账关系绑定申请通知", reqBody); - System.out.println(reqBody); + } - JSONObject respData = JSONObject.parseObject(reqBody); + } else if (status == 3 || status == 4) { + period.setStatus(PlatformPeriodStatusEnum.status3.getNumber()); + period.setSuggestionReject(respData.getString("result")); + merPlatformPeriodService.editData(period); - // 分手接收方申请记录 - BsMerLedgerReceiverApply receiverApply = merLedgerReceiverApplyService.getReceiverApplyByApplyId(respData.getString("applyId")); - if (receiverApply != null) { - receiverApply.setNotifyBody(reqBody); - // 1:通过,2拒绝 - receiverApply.setStatus( - respData.getString("auditStatus").equals("1") - ?MerLedgerReceiverApplyStatusEnum.status2.getNumber() - :MerLedgerReceiverApplyStatusEnum.status3.getNumber()); - receiverApply.setRejectReason(respData.getString("auditStatusText")); - merLedgerReceiverApplyService.editReceiverApply(receiverApply); - - // 分账接收方 - BsMerLedgerReceiver ledgerReceiver = merLedgerReceiverService.getMerLedgerReceiver(receiverApply.getMerId(), receiverApply.getReceiverNo()); - if (ledgerReceiver != null) { - ledgerReceiver.setStatus( - receiverApply.getStatus().equals( - MerLedgerReceiverApplyStatusEnum.status2.getNumber()) - ?MerLedgerReceiverStatusEnum.status0.getNumber() - :MerLedgerReceiverStatusEnum.status2.getNumber() - ); - ledgerReceiver.setAuditStatus( - receiverApply.getStatus().equals(MerLedgerReceiverApplyStatusEnum.status2.getNumber()) - ?MerLedgerReceiverAuditStatusEnum.status2.getNumber() - :MerLedgerReceiverAuditStatusEnum.status5.getNumber() - ); - ledgerReceiver.setRejectReason(receiverApply.getRejectReason()); - merLedgerReceiverService.editMerLedgerReceiver(ledgerReceiver); } } 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 8599640..e688c90 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 @@ -4,20 +4,20 @@ import com.alibaba.fastjson.JSONObject; import com.hfkj.channel.llg.config.LLGConfig; import com.hfkj.channel.llg.util.AesUtil; import com.hfkj.channel.llg.util.HttpsUtils; +import com.hfkj.common.exception.BaseException; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.config.CommonSysConst; -import com.hfkj.entity.BsLklMcc; -import com.hfkj.entity.BsTradeOrder; -import com.hfkj.entity.LlgRegion; +import com.hfkj.entity.*; import com.hfkj.model.MerBasisModel; import com.hfkj.service.BsLklMccService; import com.hfkj.service.BsMerService; +import com.hfkj.service.LlgBankCodeService; import com.hfkj.service.LlgRegionService; -import com.hfkj.sysenum.MerSettleType; -import com.hfkj.sysenum.MerStatusEnum; -import com.hfkj.sysenum.MerTypeEnum; +import com.hfkj.service.period.BsMerPlatformPeriodRateService; +import com.hfkj.service.period.BsMerPlatformPeriodService; +import com.hfkj.sysenum.*; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -51,158 +51,230 @@ public class LLGMerService { @Resource private BsLklMccService mccService; + @Resource + private BsMerPlatformPeriodService merPlatformPeriodService; + + @Resource + private BsMerPlatformPeriodRateService merPlatformPeriodRateService; + + @Resource + private LlgBankCodeService llgBankCodeService; + /** * 零零购商户入网申请417 * @return * @throws Exception */ - public Map merApply(Long merId) throws Exception { - // 商户详情 - MerBasisModel merDetail = merService.getMerDetail(merId); - if (merDetail == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商户"); - } - if (!merDetail.getMerStatus().equals(MerStatusEnum.status1.getNumber())) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户状态未处于正常"); - } - if (!merDetail.getMerType().equals(MerTypeEnum.status1.getNumber()) - && !merDetail.getMerType().equals(MerTypeEnum.status2.getNumber())) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户无法申请"); - } - // 查询零零购地区 - LlgRegion llgRegion = llgRegionService.getDataByAreaCode(merDetail.getMerRegion().getAreaCode()); - if (llgRegion == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的地区"); - } - // 查询MCC编码 - BsLklMcc mccData = mccService.getMccByCode(merDetail.getMerMccCode()); - if (mccData == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的MCC编码"); - } + public Map merApply(Long merId) { + try { + // 商户详情 + MerBasisModel merDetail = merService.getMerDetail(merId); + if (merDetail == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商户"); + } + if (!merDetail.getMerStatus().equals(MerStatusEnum.status1.getNumber())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户状态未处于正常"); + } + if (merDetail.getMerType().equals(MerTypeEnum.status3.getNumber())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户无法申请"); + } + // 查询分期渠道配置 + BsMerPlatformPeriod platformPeriod = merPlatformPeriodService.getDetailByMer(merDetail.getMerNo(), PlatformPeriodTypeEnum.type1); + if (platformPeriod == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "分期渠道未配置"); + } + // 查询零零购地区 + LlgRegion llgRegion = llgRegionService.getDataByAreaCode(merDetail.getMerRegion().getAreaCode()); + if (llgRegion == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的地区"); + } + // 查询MCC编码 + BsLklMcc mccData = mccService.getMccByCode(merDetail.getMerMccCode()); + if (mccData == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的MCC编码"); + } + if (StringUtils.isBlank(mccData.getExt2())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户MCC编码不支持开通分期"); + } - Map map = new HashMap<>(); - if (merDetail.getMerType().equals(MerTypeEnum.status1.getNumber())) { - map.put("mer_type", "1"); - } else if (merDetail.getMerType().equals(MerTypeEnum.status2.getNumber())) { - map.put("mer_type", "0"); - } - map.put("access_mode", 3); - map.put("company_name", merDetail.getCompanyName()); - map.put("merchant_sub_name", merDetail.getMerAbbreviate()); - map.put("manager_name", merDetail.getRegName()); - map.put("manager_phone", merDetail.getRegPhone()); - map.put("manager_email", merDetail.getRegEmail()); - map.put("legal_rep_phone", merDetail.getRegPhone()); - - map.put("province_code", llgRegion.getProvinceCode().toString()); - map.put("Province1", llgRegion.getProvinceName()); - map.put("city_code", llgRegion.getCityCode().toString()); - map.put("city", llgRegion.getCityName()); - map.put("district_code", llgRegion.getAreaCode().toString()); - map.put("district_name", llgRegion.getAreaName()); - map.put("scope", merDetail.getMerIndustry().getChildName()); - map.put("mcc", "1005"); - - // 查询经营地区 - LlgRegion bizRegion = llgRegionService.getDataByAreaCode(merDetail.getMerRegion().getAreaCode()); - if (bizRegion == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的地区"); - } - 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("open_union_pay", 1); // 开通银联分期 1.开通 2.不开通 - map.put("union_pay_fee_paid","2"); // 银联贴息方式 1:商户贴息 2:用户贴息 3:商户用户各一半 - - JSONObject unionpayRate = new JSONObject(); - unionpayRate.put("3", "0.12"); - unionpayRate.put("6", "0.34"); - unionpayRate.put("12", "0.46"); - - map.put("unionpay_rate", unionpayRate.toString()); // 银联分期费率(1类银行) - map.put("unionpay_rate_1", unionpayRate.toString()); // 银联分期费率(2类银行) - - /* map.put("open_hua_bei", 2); // 开通花呗分期 1.开通 2.不开通 - map.put("hua_bei_pay_fee_paid", 2); // 花呗贴息方式 1:商户贴息 2:用户贴息*/ - /***** 分期配置 ******/ - - /***** 营业执照 ******/ - map.put("address", merDetail.getBlisRegAddress()); - map.put("bus_lic_no", merDetail.getBlisNo()); - map.put("license_begin_date", merDetail.getBlisPeriodStart().replace("年", "-").replace("月", "-").replace("日", "")); - if (merDetail.getBlisPeriodType().equals(2)) { - map.put("cert_indate", "29991231"); - } else { - map.put("cert_indate", merDetail.getBlisPeriodStart().replace("年", "-").replace("月", "-").replace("日", "")); - } - /***** 营业执照 ******/ - - /***** 法人信息 ******/ - map.put("legal_rep", merDetail.getLarName()); - 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_end_date", "29991231"); - } else { - map.put("legal_cert_end_date", merDetail.getLarIdCardPeriodEnd().replace(".", "")); - } - /***** 法人信息 ******/ + Map map = new HashMap<>(); + if (merDetail.getMerType().equals(MerTypeEnum.status1.getNumber())) { + map.put("mer_type", "1"); + } else if (merDetail.getMerType().equals(MerTypeEnum.status2.getNumber())) { + map.put("mer_type", "0"); + } + map.put("access_mode", 3); // 接入模式 商户登录:1 二维码扫码:2 接口:3( 三选一) + map.put("company_name", merDetail.getMerName()); + map.put("merchant_sub_name", merDetail.getMerAbbreviate()); + map.put("manager_name", merDetail.getRegName()); + map.put("manager_phone", merDetail.getRegPhone()); + map.put("manager_email", merDetail.getRegEmail()); + map.put("legal_rep_phone", merDetail.getRegPhone()); - /***** 结算信息 ******/ - if (merDetail.getMerSettleAcct().getSettleType().equals(MerSettleType.status1.getNumber())) { - map.put("payment_type", 1); - } else { - map.put("payment_type", 2); - } - map.put("settlement_name", merDetail.getMerSettleAcct().getBankCardHolder()); - map.put("settlement_acc", merDetail.getMerSettleAcct().getBankCardNo()); - map.put("settlement_bank", merDetail.getMerSettleAcct().getOpenningBankName()); - map.put("bank_top_code", "303"); - map.put("Bank_code", merDetail.getMerSettleAcct().getOpenningBankCode()); - map.put("bank_province", merDetail.getMerSettleAcct().getOpenningBankProvinceName()); - map.put("bank_city", merDetail.getMerSettleAcct().getOpenningBankCityName()); - /***** 结算信息 ******/ - - /***** 图片资料上传 ******/ - // 营业执照 - map.put("bus_lic_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getBlisUrl()))); - // 法人身份证正面照片 - map.put("legal_rep_id_card_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getLarIdCardPortraitImg()))); - // 法人身份证背面照片 - map.put("legal_rep_id_card_pic_back", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getLarIdCardNationalEmblemImg()))); - - if (merDetail.getMerSettleAcct().equals(MerSettleType.status1.getNumber())) { - // 开户许可证 - map.put("open_lic_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getOpenningBankLicenseUrl()))); - // 结算帐户照片 - map.put("settlement_acc_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getOpenningBankLicenseUrl()))); - } else { - // 开户许可证 - map.put("open_lic_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getBankCardImg()))); - // 结算帐户照片 - map.put("settlement_acc_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getBankCardImg()))); - } + map.put("province_code", llgRegion.getProvinceCode().toString()); + map.put("Province1", llgRegion.getProvinceName()); + map.put("city_code", llgRegion.getCityCode().toString()); + map.put("city", llgRegion.getCityName()); + map.put("district_code", llgRegion.getAreaCode().toString()); + map.put("district_name", llgRegion.getAreaName()); + map.put("scope", merDetail.getMerIndustry().getChildName()); + map.put("mcc", mccData.getExt2()); + + // 查询经营地区 + LlgRegion bizRegion = llgRegionService.getDataByAreaCode(merDetail.getMerRegion().getAreaCode()); + if (bizRegion == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的地区"); + } + 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("open_union_pay", platformPeriod.getOpenUnionpay().equals(true)?1:2); // 开通银联分期 1.开通 2.不开通 + if (platformPeriod.getOpenUnionpay().equals(true)) { + map.put("union_pay_fee_paid", platformPeriod.getUnionpayFeePaid()); // 银联贴息方式 1:商户贴息 2:用户贴息 3:商户用户各一半 + + // 银联分期费率(1类银行) + List unionpay1RateList = merPlatformPeriodRateService.getList(platformPeriod.getId(), MerPlatformPeriodRateTypeEnum.type1); + JSONObject unionpayRate1 = new JSONObject(); + for (BsMerPlatformPeriodRate rate : unionpay1RateList) { + unionpayRate1.put(rate.getPeriodNum()+"", rate.getRate()); + } + map.put("unionpay_rate", unionpayRate1.toString()); // 银联分期费率(1类银行) + + // 银联分期费率(2类银行) + List unionpay2RateList = merPlatformPeriodRateService.getList(platformPeriod.getId(), MerPlatformPeriodRateTypeEnum.type2); + JSONObject unionpayRate2 = new JSONObject(); + for (BsMerPlatformPeriodRate rate : unionpay2RateList) { + unionpayRate2.put(rate.getPeriodNum()+"", rate.getRate()); + } + map.put("unionpay_rate_1", unionpayRate2.toString()); // 银联分期费率(2类银行) + } + + // 花呗分期 + map.put("open_hua_bei", platformPeriod.getOpenUnionpay().equals(true)?1:2); // 开通银联分期 1.开通 2.不开通 + if (platformPeriod.getOpenUnionpay().equals(true)) { + map.put("hua_bei_pay_fee_paid", platformPeriod.getAlipayFeePaid()); // 花呗贴息方式 1:商户贴息 2:用户贴息 + // 花呗分期费率 + List unionpay1RateList = merPlatformPeriodRateService.getList(platformPeriod.getId(), MerPlatformPeriodRateTypeEnum.type3); + JSONObject unionpayRate1 = new JSONObject(); + for (BsMerPlatformPeriodRate rate : unionpay1RateList) { + unionpayRate1.put(rate.getPeriodNum()+"", rate.getRate()); + } + map.put("hb_rate", unionpayRate1.toString()); // 花呗分期费率 + } + /***** 分期配置 ******/ + + /***** 营业执照 ******/ + map.put("address", merDetail.getBlisRegAddress()); + map.put("bus_lic_no", merDetail.getBlisNo()); + map.put("license_begin_date", merDetail.getBlisPeriodStart().replace("年", "-").replace("月", "-").replace("日", "")); + if (merDetail.getBlisPeriodType().equals(2)) { + map.put("cert_indate", "29991231"); + } else { + map.put("cert_indate", merDetail.getBlisPeriodStart().replace("年", "-").replace("月", "-").replace("日", "")); + } + /***** 营业执照 ******/ + + /***** 法人信息 ******/ + map.put("legal_rep", merDetail.getLarName()); + 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_end_date", "29991231"); + } else { + map.put("legal_cert_end_date", merDetail.getLarIdCardPeriodEnd().replace(".", "")); + } + /***** 法人信息 ******/ + + /***** 结算信息 ******/ + if (merDetail.getMerSettleAcct().getSettleType().equals(MerSettleType.status1.getNumber())) { + map.put("payment_type", 1); + } else { + map.put("payment_type", 2); + } + map.put("settlement_name", merDetail.getMerSettleAcct().getBankCardHolder()); + map.put("settlement_acc", merDetail.getMerSettleAcct().getBankCardNo()); + map.put("settlement_bank", merDetail.getMerSettleAcct().getOpenningBankName()); - // 经营场所照片 - List premisePicList = new ArrayList<>(); - premisePicList.add(upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getStoreModel().getCashRegisterImg()))); - premisePicList.add(upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getStoreModel().getInternalImg()))); - map.put("premise_pic", premisePicList); + String bankName = merDetail.getMerSettleAcct().getBankName(); + if (bankName.lastIndexOf("银行") > 0) { + bankName = bankName.substring(0, bankName.lastIndexOf("银行")); + } + // 查询零零购银行编码 + LlgBankCode banTopCode = llgBankCodeService.getDetail(bankName); + if (banTopCode == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未匹配到结算银行code"); + } + 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()); + /***** 结算信息 ******/ - // 协议照片 - map.put("agreement_pics", premisePicList); - /***** 图片资料上传 ******/ + /***** 图片资料上传 ******/ + // 营业执照 + map.put("bus_lic_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getBlisUrl()))); + // 法人身份证正面照片 + map.put("legal_rep_id_card_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getLarIdCardPortraitImg()))); + // 法人身份证背面照片 + map.put("legal_rep_id_card_pic_back", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getLarIdCardNationalEmblemImg()))); - System.out.println("请求:" + JSONObject.toJSONString(map)); - String responseData = HttpsUtils.doLLGPost(LLGConfig.requestUrl + "/v3/openapi/sign/apply", AesUtil.aesEncrypt(LLGConfig.key, JSONObject.toJSONString(map))); - return JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, responseData), Map.class); + if (merDetail.getMerSettleAcct().getSettleType().equals(MerSettleType.status1.getNumber())) { + // 开户许可证 + map.put("open_lic_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getOpenningBankLicenseUrl()))); + // 结算帐户照片 + map.put("settlement_acc_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getOpenningBankLicenseUrl()))); + } else { + // 开户许可证 + map.put("open_lic_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getBankCardImg()))); + // 结算帐户照片 + map.put("settlement_acc_pic", upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getMerSettleAcct().getBankCardImg()))); + } + // 经营场所照片 + List premisePicList = new ArrayList<>(); + premisePicList.add(upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getStoreModel().getCashRegisterImg()))); + premisePicList.add(upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + merDetail.getStoreModel().getInternalImg()))); + map.put("premise_pic", premisePicList); + + // 协议照片 + List agreementPicsList = new ArrayList<>(); + for (String agreementPics : platformPeriod.getAgreementPics().split(",")) { + agreementPicsList.add(upload(new File(CommonSysConst.getSysConfig().getFile_url() + "/" + agreementPics))); + } + map.put("agreement_pics", agreementPicsList); + /***** 图片资料上传 ******/ + + map.put("result_call_back", CommonSysConst.getSysConfig().getDomainName()+"/crest/llgNotify/merApply"); + + System.out.println("请求:" + JSONObject.toJSONString(map)); + String responseStr = HttpsUtils.doLLGPost(LLGConfig.requestUrl + "/v3/openapi/sign/apply"+(StringUtils.isNotBlank(platformPeriod.getPlatformNo())?"/"+platformPeriod.getPlatformNo():""), AesUtil.aesEncrypt(LLGConfig.key, JSONObject.toJSONString(map))); + JSONObject responseData = JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, responseStr)); + if (responseData.getJSONObject("status").getString("code").equals("2000")) { + platformPeriod.setStatus(PlatformPeriodStatusEnum.status2.getNumber()); + platformPeriod.setPlatformNo(responseData.getJSONObject("data").getString("id")); + merPlatformPeriodService.editData(platformPeriod); + } else { + platformPeriod.setStatus(PlatformPeriodStatusEnum.status3.getNumber()); + platformPeriod.setSuggestionReject(responseData.getJSONObject("status").getString("msg")); + merPlatformPeriodService.editData(platformPeriod); + + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseData.getJSONObject("status").getString("msg")); + } + + } catch (BaseException e) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, e.getErrorMsg()); + } catch (Exception e) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知错误"); + } + + return null; /** * { * "data": { @@ -222,14 +294,27 @@ public class LLGMerService { * @return * @throws Exception */ - public Map merDetail(Long merId) throws Exception { + public JSONObject merDetail(Long merId) throws Exception { // 商户详情 MerBasisModel merDetail = merService.getMerDetail(merId); if (merDetail == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商户"); } - String responseData = HttpsUtils.doLLGGet(LLGConfig.requestUrl + "/v3/openapi/sign/apply/" + "3876"); - return JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, responseData), Map.class); + // 查询分期渠道配置 + BsMerPlatformPeriod platformPeriod = merPlatformPeriodService.getDetailByMer(merDetail.getMerNo(), PlatformPeriodTypeEnum.type1); + if (platformPeriod == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "分期渠道未配置"); + } + if (StringUtils.isBlank(platformPeriod.getPlatformNo())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "分期渠道未申请"); + } + String responseStr = HttpsUtils.doLLGGet(LLGConfig.requestUrl + "/v3/openapi/sign/apply/" + platformPeriod.getPlatformNo()); + JSONObject responseData = JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, responseStr)); + if (responseData.getJSONObject("status").getString("code").equals("2000")) { + return responseData.getJSONObject("data"); + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseData.getJSONObject("status").getString("msg")); + } } /** 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 5b7352d..f5b838a 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 @@ -4,14 +4,29 @@ import com.alibaba.fastjson.JSONObject; import com.hfkj.channel.llg.config.LLGConfig; import com.hfkj.channel.llg.util.AesUtil; import com.hfkj.channel.llg.util.HttpsUtils; -import com.hfkj.entity.BsTradeOrder; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.DateUtil; +import com.hfkj.config.CommonSysConst; +import com.hfkj.entity.*; +import com.hfkj.service.BsMerService; +import com.hfkj.service.BsTradeOrderRefundService; +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.TradeOrderRefundStatusEnum; +import com.hfkj.sysenum.TradeOrderStatusEnum; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; import java.text.DecimalFormat; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -25,6 +40,17 @@ import java.util.Map; @Component public class LLGOrderService { + @Resource + private BsMerPlatformPeriodService merPlatformPeriodService; + @Resource + private BsMerPlatformPeriodPaidService merPlatformPeriodPaidService; + @Resource + private BsMerService merService; + @Resource + private BsTradeOrderRefundService tradeOrderRefundService; + @Resource + private BsTradeOrderService tradeOrderService; + /** * 获取银行列表 * @param merId 商户号 @@ -42,10 +68,24 @@ public class LLGOrderService { * @throws Exception */ public Map createOrder(BsTradeOrder tradeOrder) throws Exception { + // 查询分期渠道 + BsMerPlatformPeriod period = merPlatformPeriodService.getDetailByMer(tradeOrder.getMerNo(), PlatformPeriodTypeEnum.type1); + if (period == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未开通分期渠道"); + } + // 查询当前贴息方式 + BsMerPlatformPeriodPaid periodPaid = merPlatformPeriodPaidService.getCurrenPeriodPaid(tradeOrder.getMerNo(), PlatformPeriodTypeEnum.type1); + if (periodPaid == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未只渠道贴息方式"); + } + tradeOrder.setPlatformType(period.getPlatformType()); + tradeOrder.setPlatformMerNo(periodPaid.getPlatformNo()); + tradeOrderService.editOrder(tradeOrder); + Map param = new HashMap<>(); - param.put("merId", tradeOrder.getPlatformMerNo()); - param.put("marketId", "135"); - param.put("pkgId", "54"); + param.put("merId", periodPaid.getPlatformNo()); + param.put("marketId", periodPaid.getPlatformMarketId()); + param.put("pkgId", periodPaid.getPlatformPkgId()); param.put("bankId", tradeOrder.getPeriodBankCode()); param.put("orderId", tradeOrder.getOutTradeNo()); param.put("nickPrice", tradeOrder.getTradeAmount().multiply(new BigDecimal("100")).intValue()); @@ -54,7 +94,7 @@ public class LLGOrderService { if (StringUtils.isNotBlank(tradeOrder.getSubject())) { param.put("phoneName", tradeOrder.getSubject()); } - param.put("backUrl", "https://gratia-pay.dctpay.com/crest/llgNotify/trade"); // 回调地址 + param.put("backUrl", CommonSysConst.getSysConfig().getDomainName()+"/crest/llgNotify/trade"); // 回调地址 param.put("qrcode", false); String dataStr = AesUtil.aesEncrypt(LLGConfig.key, JSONObject.toJSONString(param)); @@ -83,14 +123,50 @@ public class LLGOrderService { * @return * @throws Exception */ - public JSONObject refund(String merId, String orderId, String payType, BigDecimal txnAmt) throws Exception { + public Map refund(String refundNo) throws Exception { + // 查询退款订单 + BsTradeOrderRefund orderRefund = tradeOrderRefundService.getRefundByRefundNo(refundNo); + if (orderRefund == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到退款订单"); + } + // 查询交易订单 + BsTradeOrder tradeOrder = tradeOrderService.getOrderByOutTradeNo(orderRefund.getOutTradeNo()); + if (tradeOrder == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到交易订单"); + } + BsMer mer = merService.getMer(orderRefund.getMerId()); + if (mer == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户"); + } + // 查询分期渠道 + BsMerPlatformPeriod period = merPlatformPeriodService.getDetailByMer(mer.getMerNo(), PlatformPeriodTypeEnum.type1); + if (period == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到渠道"); + } Map map = new HashMap<>(); - map.put("merId", merId); - map.put("orderId", orderId); - map.put("payType", payType); - map.put("txnAmt", txnAmt.multiply(new BigDecimal("100"))); - String responseData = HttpsUtils.doLLGPost(LLGConfig.requestUrl + "/v3/openapi/order/refund", AesUtil.aesEncrypt(LLGConfig.key, JSONObject.toJSONString(map))); - return JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, responseData)); + map.put("merId", period.getPlatformNo()); + map.put("orderId", orderRefund.getOutTradeNo()); + map.put("payType", "02"); + map.put("txnAmt", orderRefund.getRefundAmount().multiply(new BigDecimal("100"))); + String responseStr = HttpsUtils.doLLGPost(LLGConfig.requestUrl + "/v3/openapi/order/refund", AesUtil.aesEncrypt(LLGConfig.key, JSONObject.toJSONString(map))); + JSONObject responseData = JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, responseStr)); + if (!responseData.getJSONObject("status").getString("code").equals("2000")) { + 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.setRefundTime(new Date()); + orderRefund.setStatus(TradeOrderRefundStatusEnum.status2.getNumber()); + tradeOrderRefundService.editOrderRefund(orderRefund); + + tradeOrder.setStatus(TradeOrderStatusEnum.status6.getNumber()); + tradeOrderService.editOrder(tradeOrder); + + Map returnMap = new HashMap<>(); + returnMap.put("order", tradeOrder); + returnMap.put("orderRefund", orderRefund); + return returnMap; } /** @@ -108,4 +184,9 @@ public class LLGOrderService { return JSONObject.parseObject(AesUtil.aesDecrypt(LLGConfig.key, responseData)); } + public static void main(String[] args) throws Exception { + String str = "136ff816329f6876c13aaca9391ebcfe2cf8bd3c8a26ea7f74305e9663f3a9e507f6d0f80f8c6c99079ce7d5d902dfd5cf505f41ebc945f37a05eadb0714a9c813560e7c943a0c175043c0fb45bcca1a73d25c1aab272e1c4c52b4788b6501a04f9259621e95f02fc378f1e29368f4b18f12b8336911f1b2725a69a87efdf7d24928dec30a1cf7b275a62922ebf480fd2060f837e81e69185231f136846a9fdc35e3aa00e88920adb347374123f460d024fe724f7f483afad3507cf3128808ee5e5f6be2ea8edef9a0b18eed2508c812e9af6ea8b8167c14a2b2a125418f0e69586a17401887bb475eba71fea1e2c6cb81616b33c285bacb55edda82954c5587a55fe465beaf4787d12391e57f037b4ab80f78aea38f9bf59279f86dafd60041e6059b96960f441f017492ca21fc873686d5d9b90d9d1d0f61e8a9a9aca29203eb845570cbad41d1b36153c105bf043971ba8c84fd4623d2b47bb012dea386801c4359f0e2ec6f282945b233c5ad6ef71a178778621aff1e1eb3f99cfff3b6b2f61f80e7920a1b8f1c6fbf975ba6f1eef6cb77c4b08bf3f5e4074d0a7775b07b0ef3323e813ba301eefed1919670b7a99c51b7674ac9e13ff1e360db126f46f1898ab41ee9d840b706587664734d3d318cd57dca5c54a3f265c74342a99bd246ea360e97dab743e45f014e26308fe1fc9817296dd489bf799e381e37723797e5595c12f2b443e8c12947fcca56c57515b2785329ac47af5a258b7f09b47d698d983fb0659907467e63c14899e1d092e19f8e4e2736a4fb583ab2e06b44ab6fd934e2a45e77bcf647907bdf1c80d33a664bb4a07a42db5ee075079ce0beaed986562669b517100b3e480669f5ecc22b747ac3ef2c005f17769d6feadaff6f70caeddf40b8d0d3f0449a8838b6e0171fc64a164377de2cfa20c0e9a38e59e2368ecf4508d90e158b5430c3e4518bee6feab4cb683541fcb35d69075e86c4b71ccf109afc71b2ed4b6070e64ff395ca6b9e47857b6f949b93a3c99cd6e1200128046b29175d7d1cbc0dd7851a0e7d4fab09b492003182acd1f86769323e2b96ee7ed45b632b014f7a4bd7345e68ab3cd6f6d302646452a005b170608eeabdf24a0ba00e0bdd9cd6ea8af9340979a88bc853dd12df321b7de9051671ff2f2677d023c7ba021198febc2bb7909a54798e1c518bcd7bf4d28416f5e6e0015ac660a5d147ae0e41d64b0640e29f9e82f24881105679ecf24e4d44e30902435b36613150065a1d8f9134bb3eff3eae133eabd351d92d1a79d294d5a36b6ded2330338cefc9bbc9eeaff3ee62b50e62e48d58dbb5e71de8b2aa7a2724a1a7672bf7fcf560f9059643b7fbf8d134047240e778e8322881c5c37a5e6b44136e7350892865f65ec7d9bcddfc4d3aba2131aa1fd82359ea291bb95935bd217bcb7643281ec83978ac73ecde04632db3c2db69d796ee58dbbd147f97100efda154fc52a2a26b6c7e8ca602c72f4e5d7cc2d0db965dba8911efdb79f03e483de1ddfff402ed88ce09359366e1dd50eced9c5712e3873f5024cb6af696e26017b0af91b142b42c010b775e4a931f4540249bc1d13ceb3c57d9ebf7d740d746a2cd0549a0a5e4eb85f72f3bce341a8d1888ad3722c735d2089b7e66c0774e1252cd719fbb3adb5e6108c62d6e8b5c285bc00a92635f2c136f3ae67b53ed0879271ca3b743ec54035c8893fc998aca8413f384047b58c6edef5492d8d443bd915318347d063236a30336727921c236a4baa15929cf0d6552304df4dc4659822a86f78ac19e1b346af49500fefda78c9fbc23a1a3db9c674282dd2e798bf0af750d4154a9570e002b54d8fc0e77087506717fa7b7a99f8374fe5b99e7ffe7ae1984be9d9edc926de85380f9b2eaa5e9704df24a95f6b1570146f04a39d047fbbc04094019f30871e1b08d10fe1e5970bc50f07b926f5051f98e00f4c6419098fc365208cd38245c58923e9080d8d43488742cde5cfd4acfbcdf6fc93a4a0a5ef04ef46179aef4a1d6f94e8ffb7ca9a05f67d58191e37a522bfe5d3ce6314304e1a022104bef45b585dd8e49769f84ec5811276084758eef47c3db68de38c28e2109e03ba0aac75552cc6676edf8f01372e6ddb2ec14357c3a75b4de3a70cb7d3d185faa8712f5ca4b8bbf0d98fbaa51fb0ef882d12466fa2cabcece8b68a8c6db58d11dc4883f836f9315e391e34926672c0dce47ea5a6f2dadfb8bd3b7440a613019cce280cea87816cefa90cebac09f281e7553bcece1d5d8f2c1005e285b2707e0cb434bf79cca1604601be2a01a535df402e5236c11300b1fce369458a4cf9775b75118c2fb3e6f9b213ecc253ea22736117f907c1e785a63f229df1fbd0a33666db4cafd9f3c574d2e0eb803d4e8ae066b9d06e0a06a44a4c6be472564460084efc8f8f895b52a4b213f0d810a6fe4b7a0c3ce9dede08d7d8d73cdf3213f9732c3e00f80eca77fb9519bf07f6419f7ecc4c516ed2e6494afaa7165751422fa4546d1d802d9094bc0458919ba6b625cc778af537427fd8c52122a24f35f9156807f3bd5a6fe3180737cafa8c8c54f2bd1c8f949f4d2ad88780c8495ef53d62d7919ba421ab7b4b4210f89de0d24eac49faf75b40137c37a7dc17a39e8cf730ca9a86861d7d69726c162e7bb35afc2102e01a55c13f952a068f5ee2dbc95b34317c5c3b04f8ada658a9e85bb8b7669a9c79c7ee8cfa991835afb42cf5e77061febc018fec4d25ab6193c8fc424f464bbf85fe20bc6c49fef2e56a911da1c5fc25933eea0f37af12818d06b5c0a0532db1d0ef01f2da0c4ad1a0ba69a4d42478284a9b84eedd640429ab1cbaed89d89c1c90ce7132c11fbc970897993d0eee4b85693ea875f352edf6e4643e10b145eced2e1ac6d98dce717c99a0c016c25cd4dbe4e9b6896b770c3977d142fb4c3c6a8095bce23eed5d719b46535c2b18011b870f49521cd04d4a0533a516d7a29bc10a94aedd73cc7ab50be628189e1d53893f6a57404893183f2219acb8481d70835b9c48a149c69567cce2ce320d480a1ab36ee64b447fec96e1aa19886029e6e25cae395247f99103d6ecd57c07a4b7dd8394e5f4f4918047e41ac9e8096bf81df5b3c2203e881874f565662b1bd4a9d7719afe92974386488a11ab4ee8db17f6c2661f7e62a7faefac47be384cd25d56d6d4e6b74379b7ca7d4aad18ee68c06808fab1055d32ab02506a0b2ab371cb3655a329cb1ea64bdfe4de8e3cc8553e48eb67bb23697abdea9b87af683ddf136be198e97b64bfbf343e111728784eb0b5a3c209ffdea51ac8335436dff1088daa2e117543b52a9c2ad78ea37e5c2e82ad5133e972b2a4ba89a15cf7096863faca0376945b5f256f88f7a78fbb7258892982bcc60ab2d0e27972fca5c8943e5ef7519a1ee105eb913f12a463428698b9e32112a11857621b18d1d3ab69eb20cb54042db3f8e804a33c446fb936233d40193157d10700b8f74f42b6e281ab236f0fc1a31b9713b221689639124de8c11c7700bc0a40cac04f6f9800e2deadeb87ad5607fd82a5f757beb32e7c120f925e012c0ed236b29c8909702f213c6e76b354db6421269fe0653a369c135c6b2272cb61985d302c31ff4735d542e4411b0abb11741a43b1770da5309a93b8c15c970fbf060ef08a82b713927e69bf9ac47079e7eb364239989c0838769d6648cce9be97d7c13375bdc909fa4201b0f837176dfc6797476fabbf7de3740d75db6947b4565e21dda0f4df2213de8d6d55465dfcae9d3ebe50c61cf920dc8fb083043bca65769c6709c019d577f9f8e792905119429c59f58025800bf60357eb1629257fa3807e815a55088dfaa25c0efb56696aa9bbe613d2747936dabcaf15fec646a1c0bc91c9ab5691ef72b95a6085ea4536ff65fda1806651424148a45770f67d37c0169ea93e03ec0bf3f6240d5fddcf7f27eab6b76d5b82976cb3d4c9dcb6c0e54b236b7892c10ed3c13f9f9de092f37d085da10a83c56c2f600f93f0b491844261297a7ae7d774af5cea27b8d32047ae5f73560f57980ac6c5db6d3127dfde08998301e35f42a643cd33f79310592f99cc1a164a6eaafe50d08e7adbeebfd2a3498653ba880e7bf2328691d1b833a42e0e011c1ede34e3821ae0fe38aba5c0d9add4a2b51ba04a65f846fa4fc46d7b4591ceab4a5396cb1d50f4db3fc7952969f6c2200334d77e6b4bccb18e8ced07b29a603448862c87eb4048b0bdae1265941370add3bc33816c1f027dcf204db22c8f4c0230acec1c0bd1d65d1ce99d8f49d69adaa4aeae01aa931b39595b68807fb541cc81a1a8669aaedfa31216902006b6905a15dd2489c458df7b0e33326c44f411b3860836aa3eb0d91052575bf6d8b80b88a448946e9edb5f1834e85c413d7dad9ca2fd4c24d38cdb828e0de640c13c22e62799fec51901d07d298a952366e1b9c361533df8451bca46912369ae4976c4e711952de52e3088c9da572a5ece4f7fce5c89238d0f14ff10b747a6b20b5165f78ff87bcb925783df360d3c9814653644f390231a27bcdf81a563d15aebc190a01b6ecf77612b79f6d56c05747960a9364f5e4e6c52c184f5261d75cc93a350011ba3bb57c00c4eedd8ad649af56b63428a5f0de797ae59ba497188c8744030bfb657db6896cc4b0cb0601267cd207e3d69840e0a317a17ed7f95d87680fb493182eec56c2defdaa019b9c7cd46f69a6a4c74ac2c62e0189539288d7259f2c2f322cf2ecb2d2909f7c37e150986776cd85386047e52182fa8d47c10ee35b13620f979514f4202f141738e9ae8d8bebcb0743860866d0fb41619671f58883a01da548639ae9ecc1f14ca1c27cd98c83ee592c92b9a9e01c12b9933ef8a701e8346c8a9d15c36a13354c0b4d73533e28c446372a61fb9e98fa184e43476d3ac88ca2d68232cee45b879bcf43e0a48287a980937389c59ae7bef6b9246e3c6039666e95be6da476bde667842e1916f7ceddaf41f950453bb6df7cdd226e87cd394c320a05f353c6f60deef901d6d99c4807e60125a2499b4b82bdbc1f1fef7987c61016bb156ec95263c44a067b2ab7df627152f4ba5e077515aea301037b4d6be2ed88f86807ce37e1669870cc74c44146235d1d2ab521f8f97a8d2229e929258659cba1121161677778f777b179fc64d342a29fb5490b9a5650b0a0bbfb39b8099b726c81199c41823cef484cef8708a7a20220e087478758913a4fe24602296efe14e43774087035228a514f9f2ee0a08ea71c4194b6d8cb091972b048f15c254093a6fd3f1195ce898f85d7c4a28185533c66915ff850306fa88c38b897bef8808405905d3ca32e4d2fbf90f53f938f5c290a6ea4982856e686eb683d5f6bf34009081c552e4550a4d465fb2a625e6b2fe5cd62f8c48f00f8c74980d5f23b43d822c1b465148eec68505d7551a60a9e69489256c3147a6d28e5b985830dc0edd774387b2b3662200036c203340bb32003285700507fae34069691db49654beb1391fd8ba326234fedd68768afd02eddf121851f113f1c62495524d2da35a1b633b5c66d3db104cc4c5405b0e74ebf5b54509dc8ee2bb48a192f91cec19b9e361e0f29b861208c0e3d45d77eb5a81ca15d04f04921e8d01e5116158e0aa4453040dd4d13aa8fb858b33b4930c71bc45c7619e74059ad22a6a9b9f0d94e1fec046b00c6d344ab976f4e917321561e5c1865b9d7659e35e008e833f13400553490644608e1605f13310b3d7f0a576e8a43bb3ff30cea00b14e46d595e2a5e6e86fb0472f906ad721efca66e50869597819c8962f908105fc15b4efe425d37cf39eb266e8494bd3bf41061a3c08401262558c5b3f265207953cdb6869b24910b64eba77a72d5223a17cede33b1f9fd6df29dc25122f51b65ca1d341db30c18b263cfc154f24b4fe199aa45e2a655fbcaaf60794c904099feb19ca3eb8e512f84e96cf6a70fe7cafda370256ed9d80a4c7ffd3505386a3eec12b9ae3fc1775abbe0fb2b60d9d870bb76bfe9ae45b4f016cc9932cd1c2a698712e4ec3a9250e9fbc6e5eabc63efb70e3bf1d5597bfa62f6621dce7e6d5700ecdeffe607b3444360fccf2c33f2fb8afbbbb0f46c2566bf225ca0b27711d15aa8c51399508d2e373e806652c853035eb7e37798667512e29d16867d2b2aec2f90fd94ba1ac1e0e8279acbf085dd940fff8e4cde3aa903bd852a7175b0bc9a38cea42c1e2bbd49eb2377edde3dd32c446ea2d2039557b66ebf7776fa6c5ed0cc0d3fc10d4d0115946496d05aac78b90cc0a10caa0f53bf202ae8e1e90e42a23efd2c25004f9fa5f3484321c625032ea3d3687f1402ae5569347b8b44cb4995067074c179130fa24ed0a148d22b97ee4af39928e2120f1c78a00261a9c05b588b93738078fb93dba4cfbf13f4e56d87a6f9ef95480e9203b6cb4372dfe8390c8fdc130d9ba74d77f45b58f6d2e6a74fc3c54caacdd36b1de69f3a34c2abcf27775399d6a53c10cda8a39ca643053efb8188c73bfd8a1cba0a14126c2684d62f807d0b57f60366c00c3eb38bd5fcf1cb5b0133496a81ee050c1dc130dd86b9714915de35b228fa94e8cd40edfc28bb51b7959e86ecec27ef56a9ba6ab253c445daf3206a5173d621de1ae25335145bfb346c2d8197a6c246cb1574d981d104895c8eebb72eac76d4549efdca4c2ba4a15805463913020b78063f5e4eeed68fdfd5c40243c0b0bbbc1ac20b22b8b0a40814974c4cef1f38eaaa4308d92ab86008b4cc89df47b361f650181346ae628d800868314521b621f8fb139d7eebc38bf65a9e99ae1ceeb08f5d0ae2b9a820ead30e658f6541ca878372ae1952c244b1419abd4dc3ad96cef74d941ed15e57e99ba0590900358f0c2f15db1f4efd1461187523ec0c11d2db037c199835b6a101a6d67227bc363a742b88045068d7a10e8f3e54bac682f49377ee5a6f2eee3ee953182af1d3bc36513c61dd428b8bfbaf278ee07868829709255d94d878a62d454fe76c24ad3df7f57171fe65b7370ab83e88bb1b3f27525d72a0f9b81619ff55320df562bf368f27b77d89aace805e5e82dced0e0057f2f5c7077812e4d731061086be28855d069732835a310e7b3ceccf7e66440f129b5238655b2b92aca10bd085d483dcf204e64db1e225df7378251b849f2e7cff3d5a8873c8f2a7da7c621d9c333b262d2c5e3af58c3f68298ce9fa18b0338aac3554a9c2a28430fbd78807011b267f0ffedea16bc3e8995dbe84b63b268e6c61a66cdd9c7bcea8dedaec9439c9106fdaa3280f425ea0d456e74c37ad5070e1f8e399871cc49150a04e6b146036b5ae5a2a05fa6d3040703303b6c6328f77f5b36ec1ed779622f8a7c9ae430dad51bb717288cc6cd1213cb6852e12bd3c1657764d4ce74e2553898cfac187a342c0b8dc49e37638eadd7be08182344d9f0ebc21969b7aadf5d8b300ca6fb8869d0d30f2a784014209b5399e626c14fcce6639a272bd171555d07b022a7f086ea88b9e768ea2e7a1815b7ab5797ba7af89573dc2ab56f4f9815196a0ec361229aebbcdb7e12f10c2870476611f8d4c29038ab53294ea87f80992283d089408f7b525a36403771265202a270fcafb7182f800da9edff5ebaa957e9298fe4e8b2ac0bc28421cf3b7beaefcfec08e2e3cb77589da9699760cfe7b0d66dd671c68c41e8d8d4c1bfba78267e0813b7913353a55218e9b59afea97327eb3e66f942a78bd4e012c4cbc0944eabf590d62ed4a9b829d8902e1348f22c9ebaff57b54a3f0f"; + System.out.println(AesUtil.aesDecrypt(LLGConfig.key, str)); + } + } diff --git a/service/src/main/java/com/hfkj/dao/BsMerMapper.java b/service/src/main/java/com/hfkj/dao/BsMerMapper.java index 94c35e4..fbb6594 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerMapper.java @@ -57,10 +57,10 @@ public interface BsMerMapper extends BsMerMapperExt { "lar_id_card_national_emblem_img, lar_id_card_address, ", "lar_id_card_period_type, lar_id_card_period_start, ", "lar_id_card_period_end, complete_status, ", - "mer_status, create_salesman_id, ", - "create_salesman_name, create_time, ", - "update_time, ext_1, ", - "ext_2, ext_3)", + "mer_status, period_status, ", + "create_salesman_id, create_salesman_name, ", + "create_time, update_time, ", + "ext_1, ext_2, ext_3)", "values (#{orgNo,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, ", "#{companyId,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, ", "#{agentId,jdbcType=BIGINT}, #{agentName,jdbcType=VARCHAR}, ", @@ -79,10 +79,10 @@ public interface BsMerMapper extends BsMerMapperExt { "#{larIdCardNationalEmblemImg,jdbcType=VARCHAR}, #{larIdCardAddress,jdbcType=VARCHAR}, ", "#{larIdCardPeriodType,jdbcType=INTEGER}, #{larIdCardPeriodStart,jdbcType=VARCHAR}, ", "#{larIdCardPeriodEnd,jdbcType=VARCHAR}, #{completeStatus,jdbcType=INTEGER}, ", - "#{merStatus,jdbcType=INTEGER}, #{createSalesmanId,jdbcType=BIGINT}, ", - "#{createSalesmanName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{merStatus,jdbcType=INTEGER}, #{periodStatus,jdbcType=BIT}, ", + "#{createSalesmanId,jdbcType=BIGINT}, #{createSalesmanName,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsMer record); @@ -131,6 +131,7 @@ public interface BsMerMapper extends BsMerMapperExt { @Result(column="lar_id_card_period_end", property="larIdCardPeriodEnd", jdbcType=JdbcType.VARCHAR), @Result(column="complete_status", property="completeStatus", jdbcType=JdbcType.INTEGER), @Result(column="mer_status", property="merStatus", jdbcType=JdbcType.INTEGER), + @Result(column="period_status", property="periodStatus", jdbcType=JdbcType.BIT), @Result(column="create_salesman_id", property="createSalesmanId", jdbcType=JdbcType.BIGINT), @Result(column="create_salesman_name", property="createSalesmanName", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -149,8 +150,8 @@ public interface BsMerMapper extends BsMerMapperExt { "blis_url, blis_name, blis_no, blis_reg_address, blis_period_type, blis_period_start, ", "blis_period_end, lar_name, lar_id_card, lar_id_card_portrait_img, lar_id_card_national_emblem_img, ", "lar_id_card_address, lar_id_card_period_type, lar_id_card_period_start, lar_id_card_period_end, ", - "complete_status, mer_status, create_salesman_id, create_salesman_name, create_time, ", - "update_time, ext_1, ext_2, ext_3", + "complete_status, mer_status, period_status, create_salesman_id, create_salesman_name, ", + "create_time, update_time, ext_1, ext_2, ext_3", "from bs_mer", "where id = #{id,jdbcType=BIGINT}" }) @@ -193,6 +194,7 @@ public interface BsMerMapper extends BsMerMapperExt { @Result(column="lar_id_card_period_end", property="larIdCardPeriodEnd", jdbcType=JdbcType.VARCHAR), @Result(column="complete_status", property="completeStatus", jdbcType=JdbcType.INTEGER), @Result(column="mer_status", property="merStatus", jdbcType=JdbcType.INTEGER), + @Result(column="period_status", property="periodStatus", jdbcType=JdbcType.BIT), @Result(column="create_salesman_id", property="createSalesmanId", jdbcType=JdbcType.BIGINT), @Result(column="create_salesman_name", property="createSalesmanName", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -251,6 +253,7 @@ public interface BsMerMapper extends BsMerMapperExt { "lar_id_card_period_end = #{larIdCardPeriodEnd,jdbcType=VARCHAR},", "complete_status = #{completeStatus,jdbcType=INTEGER},", "mer_status = #{merStatus,jdbcType=INTEGER},", + "period_status = #{periodStatus,jdbcType=BIT},", "create_salesman_id = #{createSalesmanId,jdbcType=BIGINT},", "create_salesman_name = #{createSalesmanName,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java index e929f3d..5c1c4a5 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodMapper.java @@ -41,22 +41,20 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt @Insert({ "insert into bs_mer_platform_period (company_id, agent_id, ", "mer_id, mer_no, platform_type, ", - "platform_no, platform_market_id, ", - "platform_pkg_id, open_unionpay, ", + "platform_no, open_unionpay, ", "unionpay_fee_paid, open_alipay, ", - "alipay_fee_paid, `status`, ", - "suggestion_reject, create_time, ", - "update_time, ext_1, ", - "ext_2, ext_3)", + "alipay_fee_paid, agreement_pics, ", + "`status`, suggestion_reject, ", + "create_time, update_time, ", + "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}, #{platformMarketId,jdbcType=BIGINT}, ", - "#{platformPkgId,jdbcType=BIGINT}, #{openUnionpay,jdbcType=BIT}, ", + "#{platformNo,jdbcType=VARCHAR}, #{openUnionpay,jdbcType=BIT}, ", "#{unionpayFeePaid,jdbcType=VARCHAR}, #{openAlipay,jdbcType=BIT}, ", - "#{alipayFeePaid,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, ", - "#{suggestionReject,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{alipayFeePaid,jdbcType=INTEGER}, #{agreementPics,jdbcType=VARCHAR}, ", + "#{status,jdbcType=INTEGER}, #{suggestionReject,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsMerPlatformPeriod record); @@ -74,12 +72,11 @@ 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_market_id", property="platformMarketId", jdbcType=JdbcType.BIGINT), - @Result(column="platform_pkg_id", property="platformPkgId", jdbcType=JdbcType.BIGINT), @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), @Result(column="alipay_fee_paid", property="alipayFeePaid", jdbcType=JdbcType.INTEGER), + @Result(column="agreement_pics", property="agreementPics", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="suggestion_reject", property="suggestionReject", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -92,9 +89,9 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt @Select({ "select", - "id, company_id, agent_id, mer_id, mer_no, platform_type, platform_no, platform_market_id, ", - "platform_pkg_id, open_unionpay, unionpay_fee_paid, open_alipay, alipay_fee_paid, ", - "`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, 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}" }) @@ -106,12 +103,11 @@ 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_market_id", property="platformMarketId", jdbcType=JdbcType.BIGINT), - @Result(column="platform_pkg_id", property="platformPkgId", jdbcType=JdbcType.BIGINT), @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), @Result(column="alipay_fee_paid", property="alipayFeePaid", jdbcType=JdbcType.INTEGER), + @Result(column="agreement_pics", property="agreementPics", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="suggestion_reject", property="suggestionReject", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -139,12 +135,11 @@ public interface BsMerPlatformPeriodMapper extends BsMerPlatformPeriodMapperExt "mer_no = #{merNo,jdbcType=VARCHAR},", "platform_type = #{platformType,jdbcType=INTEGER},", "platform_no = #{platformNo,jdbcType=VARCHAR},", - "platform_market_id = #{platformMarketId,jdbcType=BIGINT},", - "platform_pkg_id = #{platformPkgId,jdbcType=BIGINT},", "open_unionpay = #{openUnionpay,jdbcType=BIT},", "unionpay_fee_paid = #{unionpayFeePaid,jdbcType=VARCHAR},", "open_alipay = #{openAlipay,jdbcType=BIT},", "alipay_fee_paid = #{alipayFeePaid,jdbcType=INTEGER},", + "agreement_pics = #{agreementPics,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", "suggestion_reject = #{suggestionReject,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapper.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapper.java new file mode 100644 index 0000000..24fdd62 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapper.java @@ -0,0 +1,142 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsMerPlatformPeriodPaid; +import com.hfkj.entity.BsMerPlatformPeriodPaidExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface BsMerPlatformPeriodPaidMapper extends BsMerPlatformPeriodPaidMapperExt { + @SelectProvider(type=BsMerPlatformPeriodPaidSqlProvider.class, method="countByExample") + long countByExample(BsMerPlatformPeriodPaidExample example); + + @DeleteProvider(type=BsMerPlatformPeriodPaidSqlProvider.class, method="deleteByExample") + int deleteByExample(BsMerPlatformPeriodPaidExample example); + + @Delete({ + "delete from bs_mer_platform_period_paid", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "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)", + "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})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(BsMerPlatformPeriodPaid record); + + @InsertProvider(type=BsMerPlatformPeriodPaidSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(BsMerPlatformPeriodPaid record); + + @SelectProvider(type=BsMerPlatformPeriodPaidSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="platform_period_id", property="platformPeriodId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @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_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), + @Result(column="current_settle", property="currentSettle", jdbcType=JdbcType.BIT), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(BsMerPlatformPeriodPaidExample example); + + @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", + "from bs_mer_platform_period_paid", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="platform_period_id", property="platformPeriodId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @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_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), + @Result(column="current_settle", property="currentSettle", jdbcType=JdbcType.BIT), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + BsMerPlatformPeriodPaid selectByPrimaryKey(Long id); + + @UpdateProvider(type=BsMerPlatformPeriodPaidSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") BsMerPlatformPeriodPaid record, @Param("example") BsMerPlatformPeriodPaidExample example); + + @UpdateProvider(type=BsMerPlatformPeriodPaidSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") BsMerPlatformPeriodPaid record, @Param("example") BsMerPlatformPeriodPaidExample example); + + @UpdateProvider(type=BsMerPlatformPeriodPaidSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(BsMerPlatformPeriodPaid record); + + @Update({ + "update bs_mer_platform_period_paid", + "set platform_period_id = #{platformPeriodId,jdbcType=BIGINT},", + "mer_id = #{merId,jdbcType=BIGINT},", + "mer_no = #{merNo,jdbcType=VARCHAR},", + "pay_type = #{payType,jdbcType=INTEGER},", + "platform_type = #{platformType,jdbcType=INTEGER},", + "platform_no = #{platformNo,jdbcType=VARCHAR},", + "platform_fee_paid = #{platformFeePaid,jdbcType=INTEGER},", + "platform_market_id = #{platformMarketId,jdbcType=VARCHAR},", + "platform_pkg_id = #{platformPkgId,jdbcType=VARCHAR},", + "current_settle = #{currentSettle,jdbcType=BIT},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(BsMerPlatformPeriodPaid record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapperExt.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapperExt.java new file mode 100644 index 0000000..37090f2 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface BsMerPlatformPeriodPaidMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidSqlProvider.java new file mode 100644 index 0000000..9d16b65 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodPaidSqlProvider.java @@ -0,0 +1,388 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsMerPlatformPeriodPaid; +import com.hfkj.entity.BsMerPlatformPeriodPaidExample.Criteria; +import com.hfkj.entity.BsMerPlatformPeriodPaidExample.Criterion; +import com.hfkj.entity.BsMerPlatformPeriodPaidExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class BsMerPlatformPeriodPaidSqlProvider { + + public String countByExample(BsMerPlatformPeriodPaidExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("bs_mer_platform_period_paid"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(BsMerPlatformPeriodPaidExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("bs_mer_platform_period_paid"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(BsMerPlatformPeriodPaid record) { + SQL sql = new SQL(); + sql.INSERT_INTO("bs_mer_platform_period_paid"); + + if (record.getPlatformPeriodId() != null) { + sql.VALUES("platform_period_id", "#{platformPeriodId,jdbcType=BIGINT}"); + } + + if (record.getMerId() != null) { + sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.VALUES("mer_no", "#{merNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}"); + } + + if (record.getPlatformType() != null) { + sql.VALUES("platform_type", "#{platformType,jdbcType=INTEGER}"); + } + + if (record.getPlatformNo() != null) { + sql.VALUES("platform_no", "#{platformNo,jdbcType=VARCHAR}"); + } + + if (record.getPlatformFeePaid() != null) { + sql.VALUES("platform_fee_paid", "#{platformFeePaid,jdbcType=INTEGER}"); + } + + if (record.getPlatformMarketId() != null) { + sql.VALUES("platform_market_id", "#{platformMarketId,jdbcType=VARCHAR}"); + } + + if (record.getPlatformPkgId() != null) { + sql.VALUES("platform_pkg_id", "#{platformPkgId,jdbcType=VARCHAR}"); + } + + if (record.getCurrentSettle() != null) { + sql.VALUES("current_settle", "#{currentSettle,jdbcType=BIT}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(BsMerPlatformPeriodPaidExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("platform_period_id"); + sql.SELECT("mer_id"); + sql.SELECT("mer_no"); + sql.SELECT("pay_type"); + sql.SELECT("platform_type"); + sql.SELECT("platform_no"); + sql.SELECT("platform_fee_paid"); + sql.SELECT("platform_market_id"); + sql.SELECT("platform_pkg_id"); + sql.SELECT("current_settle"); + sql.SELECT("create_time"); + sql.SELECT("update_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("bs_mer_platform_period_paid"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + BsMerPlatformPeriodPaid record = (BsMerPlatformPeriodPaid) parameter.get("record"); + BsMerPlatformPeriodPaidExample example = (BsMerPlatformPeriodPaidExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("bs_mer_platform_period_paid"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getPlatformPeriodId() != null) { + sql.SET("platform_period_id = #{record.platformPeriodId,jdbcType=BIGINT}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); + } + + if (record.getPlatformType() != null) { + sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}"); + } + + if (record.getPlatformNo() != null) { + sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); + } + + if (record.getPlatformFeePaid() != null) { + sql.SET("platform_fee_paid = #{record.platformFeePaid,jdbcType=INTEGER}"); + } + + if (record.getPlatformMarketId() != null) { + sql.SET("platform_market_id = #{record.platformMarketId,jdbcType=VARCHAR}"); + } + + if (record.getPlatformPkgId() != null) { + sql.SET("platform_pkg_id = #{record.platformPkgId,jdbcType=VARCHAR}"); + } + + if (record.getCurrentSettle() != null) { + sql.SET("current_settle = #{record.currentSettle,jdbcType=BIT}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("bs_mer_platform_period_paid"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("platform_period_id = #{record.platformPeriodId,jdbcType=BIGINT}"); + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + 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_fee_paid = #{record.platformFeePaid,jdbcType=INTEGER}"); + sql.SET("platform_market_id = #{record.platformMarketId,jdbcType=VARCHAR}"); + sql.SET("platform_pkg_id = #{record.platformPkgId,jdbcType=VARCHAR}"); + sql.SET("current_settle = #{record.currentSettle,jdbcType=BIT}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + BsMerPlatformPeriodPaidExample example = (BsMerPlatformPeriodPaidExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(BsMerPlatformPeriodPaid record) { + SQL sql = new SQL(); + sql.UPDATE("bs_mer_platform_period_paid"); + + if (record.getPlatformPeriodId() != null) { + sql.SET("platform_period_id = #{platformPeriodId,jdbcType=BIGINT}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{merNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.SET("pay_type = #{payType,jdbcType=INTEGER}"); + } + + if (record.getPlatformType() != null) { + sql.SET("platform_type = #{platformType,jdbcType=INTEGER}"); + } + + if (record.getPlatformNo() != null) { + sql.SET("platform_no = #{platformNo,jdbcType=VARCHAR}"); + } + + if (record.getPlatformFeePaid() != null) { + sql.SET("platform_fee_paid = #{platformFeePaid,jdbcType=INTEGER}"); + } + + if (record.getPlatformMarketId() != null) { + sql.SET("platform_market_id = #{platformMarketId,jdbcType=VARCHAR}"); + } + + if (record.getPlatformPkgId() != null) { + sql.SET("platform_pkg_id = #{platformPkgId,jdbcType=VARCHAR}"); + } + + if (record.getCurrentSettle() != null) { + sql.SET("current_settle = #{currentSettle,jdbcType=BIT}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, BsMerPlatformPeriodPaidExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateMapper.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateMapper.java index 629de40..c9f569d 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateMapper.java @@ -39,14 +39,14 @@ public interface BsMerPlatformPeriodRateMapper extends BsMerPlatformPeriodRateMa int deleteByPrimaryKey(Long id); @Insert({ - "insert into bs_mer_platform_period_rate (platform_period_id, period_num, ", - "rate, create_time, ", - "update_time, ext_1, ", - "ext_2, ext_3)", - "values (#{platformPeriodId,jdbcType=BIGINT}, #{periodNum,jdbcType=INTEGER}, ", - "#{rate,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "insert into bs_mer_platform_period_rate (platform_period_id, period_rate_type, ", + "period_num, rate, ", + "create_time, update_time, ", + "ext_1, ext_2, ext_3)", + "values (#{platformPeriodId,jdbcType=BIGINT}, #{periodRateType,jdbcType=INTEGER}, ", + "#{periodNum,jdbcType=INTEGER}, #{rate,jdbcType=DECIMAL}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsMerPlatformPeriodRate record); @@ -59,6 +59,7 @@ public interface BsMerPlatformPeriodRateMapper extends BsMerPlatformPeriodRateMa @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="platform_period_id", property="platformPeriodId", jdbcType=JdbcType.BIGINT), + @Result(column="period_rate_type", property="periodRateType", jdbcType=JdbcType.INTEGER), @Result(column="period_num", property="periodNum", jdbcType=JdbcType.INTEGER), @Result(column="rate", property="rate", jdbcType=JdbcType.DECIMAL), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -71,14 +72,15 @@ public interface BsMerPlatformPeriodRateMapper extends BsMerPlatformPeriodRateMa @Select({ "select", - "id, platform_period_id, period_num, rate, create_time, update_time, ext_1, ext_2, ", - "ext_3", + "id, platform_period_id, period_rate_type, period_num, rate, create_time, update_time, ", + "ext_1, ext_2, ext_3", "from bs_mer_platform_period_rate", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="platform_period_id", property="platformPeriodId", jdbcType=JdbcType.BIGINT), + @Result(column="period_rate_type", property="periodRateType", jdbcType=JdbcType.INTEGER), @Result(column="period_num", property="periodNum", jdbcType=JdbcType.INTEGER), @Result(column="rate", property="rate", jdbcType=JdbcType.DECIMAL), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -101,6 +103,7 @@ public interface BsMerPlatformPeriodRateMapper extends BsMerPlatformPeriodRateMa @Update({ "update bs_mer_platform_period_rate", "set platform_period_id = #{platformPeriodId,jdbcType=BIGINT},", + "period_rate_type = #{periodRateType,jdbcType=INTEGER},", "period_num = #{periodNum,jdbcType=INTEGER},", "rate = #{rate,jdbcType=DECIMAL},", "create_time = #{createTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateSqlProvider.java index ec98641..aabd498 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodRateSqlProvider.java @@ -32,6 +32,10 @@ public class BsMerPlatformPeriodRateSqlProvider { sql.VALUES("platform_period_id", "#{platformPeriodId,jdbcType=BIGINT}"); } + if (record.getPeriodRateType() != null) { + sql.VALUES("period_rate_type", "#{periodRateType,jdbcType=INTEGER}"); + } + if (record.getPeriodNum() != null) { sql.VALUES("period_num", "#{periodNum,jdbcType=INTEGER}"); } @@ -71,6 +75,7 @@ public class BsMerPlatformPeriodRateSqlProvider { sql.SELECT("id"); } sql.SELECT("platform_period_id"); + sql.SELECT("period_rate_type"); sql.SELECT("period_num"); sql.SELECT("rate"); sql.SELECT("create_time"); @@ -103,6 +108,10 @@ public class BsMerPlatformPeriodRateSqlProvider { sql.SET("platform_period_id = #{record.platformPeriodId,jdbcType=BIGINT}"); } + if (record.getPeriodRateType() != null) { + sql.SET("period_rate_type = #{record.periodRateType,jdbcType=INTEGER}"); + } + if (record.getPeriodNum() != null) { sql.SET("period_num = #{record.periodNum,jdbcType=INTEGER}"); } @@ -141,6 +150,7 @@ public class BsMerPlatformPeriodRateSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("platform_period_id = #{record.platformPeriodId,jdbcType=BIGINT}"); + sql.SET("period_rate_type = #{record.periodRateType,jdbcType=INTEGER}"); sql.SET("period_num = #{record.periodNum,jdbcType=INTEGER}"); sql.SET("rate = #{record.rate,jdbcType=DECIMAL}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); @@ -162,6 +172,10 @@ public class BsMerPlatformPeriodRateSqlProvider { sql.SET("platform_period_id = #{platformPeriodId,jdbcType=BIGINT}"); } + if (record.getPeriodRateType() != null) { + sql.SET("period_rate_type = #{periodRateType,jdbcType=INTEGER}"); + } + if (record.getPeriodNum() != null) { sql.SET("period_num = #{periodNum,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 9ed598f..5803b6f 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerPlatformPeriodSqlProvider.java @@ -52,14 +52,6 @@ public class BsMerPlatformPeriodSqlProvider { sql.VALUES("platform_no", "#{platformNo,jdbcType=VARCHAR}"); } - if (record.getPlatformMarketId() != null) { - sql.VALUES("platform_market_id", "#{platformMarketId,jdbcType=BIGINT}"); - } - - if (record.getPlatformPkgId() != null) { - sql.VALUES("platform_pkg_id", "#{platformPkgId,jdbcType=BIGINT}"); - } - if (record.getOpenUnionpay() != null) { sql.VALUES("open_unionpay", "#{openUnionpay,jdbcType=BIT}"); } @@ -76,6 +68,10 @@ public class BsMerPlatformPeriodSqlProvider { sql.VALUES("alipay_fee_paid", "#{alipayFeePaid,jdbcType=INTEGER}"); } + if (record.getAgreementPics() != null) { + sql.VALUES("agreement_pics", "#{agreementPics,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } @@ -120,12 +116,11 @@ public class BsMerPlatformPeriodSqlProvider { sql.SELECT("mer_no"); sql.SELECT("platform_type"); sql.SELECT("platform_no"); - sql.SELECT("platform_market_id"); - sql.SELECT("platform_pkg_id"); sql.SELECT("open_unionpay"); sql.SELECT("unionpay_fee_paid"); sql.SELECT("open_alipay"); sql.SELECT("alipay_fee_paid"); + sql.SELECT("agreement_pics"); sql.SELECT("`status`"); sql.SELECT("suggestion_reject"); sql.SELECT("create_time"); @@ -178,14 +173,6 @@ public class BsMerPlatformPeriodSqlProvider { sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); } - if (record.getPlatformMarketId() != null) { - sql.SET("platform_market_id = #{record.platformMarketId,jdbcType=BIGINT}"); - } - - if (record.getPlatformPkgId() != null) { - sql.SET("platform_pkg_id = #{record.platformPkgId,jdbcType=BIGINT}"); - } - if (record.getOpenUnionpay() != null) { sql.SET("open_unionpay = #{record.openUnionpay,jdbcType=BIT}"); } @@ -202,6 +189,10 @@ public class BsMerPlatformPeriodSqlProvider { sql.SET("alipay_fee_paid = #{record.alipayFeePaid,jdbcType=INTEGER}"); } + if (record.getAgreementPics() != null) { + sql.SET("agreement_pics = #{record.agreementPics,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } @@ -245,12 +236,11 @@ 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_market_id = #{record.platformMarketId,jdbcType=BIGINT}"); - sql.SET("platform_pkg_id = #{record.platformPkgId,jdbcType=BIGINT}"); 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}"); sql.SET("alipay_fee_paid = #{record.alipayFeePaid,jdbcType=INTEGER}"); + sql.SET("agreement_pics = #{record.agreementPics,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("suggestion_reject = #{record.suggestionReject,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); @@ -292,14 +282,6 @@ public class BsMerPlatformPeriodSqlProvider { sql.SET("platform_no = #{platformNo,jdbcType=VARCHAR}"); } - if (record.getPlatformMarketId() != null) { - sql.SET("platform_market_id = #{platformMarketId,jdbcType=BIGINT}"); - } - - if (record.getPlatformPkgId() != null) { - sql.SET("platform_pkg_id = #{platformPkgId,jdbcType=BIGINT}"); - } - if (record.getOpenUnionpay() != null) { sql.SET("open_unionpay = #{openUnionpay,jdbcType=BIT}"); } @@ -316,6 +298,10 @@ public class BsMerPlatformPeriodSqlProvider { sql.SET("alipay_fee_paid = #{alipayFeePaid,jdbcType=INTEGER}"); } + if (record.getAgreementPics() != null) { + sql.SET("agreement_pics = #{agreementPics,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java index d0c857c..1938b63 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java @@ -176,6 +176,10 @@ public class BsMerSqlProvider { sql.VALUES("mer_status", "#{merStatus,jdbcType=INTEGER}"); } + if (record.getPeriodStatus() != null) { + sql.VALUES("period_status", "#{periodStatus,jdbcType=BIT}"); + } + if (record.getCreateSalesmanId() != null) { sql.VALUES("create_salesman_id", "#{createSalesmanId,jdbcType=BIGINT}"); } @@ -251,6 +255,7 @@ public class BsMerSqlProvider { sql.SELECT("lar_id_card_period_end"); sql.SELECT("complete_status"); sql.SELECT("mer_status"); + sql.SELECT("period_status"); sql.SELECT("create_salesman_id"); sql.SELECT("create_salesman_name"); sql.SELECT("create_time"); @@ -427,6 +432,10 @@ public class BsMerSqlProvider { sql.SET("mer_status = #{record.merStatus,jdbcType=INTEGER}"); } + if (record.getPeriodStatus() != null) { + sql.SET("period_status = #{record.periodStatus,jdbcType=BIT}"); + } + if (record.getCreateSalesmanId() != null) { sql.SET("create_salesman_id = #{record.createSalesmanId,jdbcType=BIGINT}"); } @@ -501,6 +510,7 @@ public class BsMerSqlProvider { sql.SET("lar_id_card_period_end = #{record.larIdCardPeriodEnd,jdbcType=VARCHAR}"); sql.SET("complete_status = #{record.completeStatus,jdbcType=INTEGER}"); sql.SET("mer_status = #{record.merStatus,jdbcType=INTEGER}"); + sql.SET("period_status = #{record.periodStatus,jdbcType=BIT}"); sql.SET("create_salesman_id = #{record.createSalesmanId,jdbcType=BIGINT}"); sql.SET("create_salesman_name = #{record.createSalesmanName,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); @@ -666,6 +676,10 @@ public class BsMerSqlProvider { sql.SET("mer_status = #{merStatus,jdbcType=INTEGER}"); } + if (record.getPeriodStatus() != null) { + sql.SET("period_status = #{periodStatus,jdbcType=BIT}"); + } + if (record.getCreateSalesmanId() != null) { sql.SET("create_salesman_id = #{createSalesmanId,jdbcType=BIGINT}"); } diff --git a/service/src/main/java/com/hfkj/dao/LlgBankCodeMapper.java b/service/src/main/java/com/hfkj/dao/LlgBankCodeMapper.java new file mode 100644 index 0000000..fb8312d --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/LlgBankCodeMapper.java @@ -0,0 +1,100 @@ +package com.hfkj.dao; + +import com.hfkj.entity.LlgBankCode; +import com.hfkj.entity.LlgBankCodeExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface LlgBankCodeMapper extends LlgBankCodeMapperExt { + @SelectProvider(type=LlgBankCodeSqlProvider.class, method="countByExample") + long countByExample(LlgBankCodeExample example); + + @DeleteProvider(type=LlgBankCodeSqlProvider.class, method="deleteByExample") + int deleteByExample(LlgBankCodeExample example); + + @Delete({ + "delete from llg_bank_code", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into llg_bank_code (bank_code, bank_name, ", + "ext_1, ext_2, ext_3)", + "values (#{bankCode,jdbcType=BIGINT}, #{bankName,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(LlgBankCode record); + + @InsertProvider(type=LlgBankCodeSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(LlgBankCode record); + + @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_name", property="bankName", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(LlgBankCodeExample example); + + @Select({ + "select", + "id, bank_code, bank_name, ext_1, ext_2, ext_3", + "from llg_bank_code", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="bank_code", property="bankCode", jdbcType=JdbcType.BIGINT), + @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), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + LlgBankCode selectByPrimaryKey(Long id); + + @UpdateProvider(type=LlgBankCodeSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") LlgBankCode record, @Param("example") LlgBankCodeExample example); + + @UpdateProvider(type=LlgBankCodeSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") LlgBankCode record, @Param("example") LlgBankCodeExample example); + + @UpdateProvider(type=LlgBankCodeSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(LlgBankCode record); + + @Update({ + "update llg_bank_code", + "set bank_code = #{bankCode,jdbcType=BIGINT},", + "bank_name = #{bankName,jdbcType=VARCHAR},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(LlgBankCode record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/LlgBankCodeMapperExt.java b/service/src/main/java/com/hfkj/dao/LlgBankCodeMapperExt.java new file mode 100644 index 0000000..82fd9e4 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/LlgBankCodeMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface LlgBankCodeMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/LlgBankCodeSqlProvider.java b/service/src/main/java/com/hfkj/dao/LlgBankCodeSqlProvider.java new file mode 100644 index 0000000..57ed1fa --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/LlgBankCodeSqlProvider.java @@ -0,0 +1,248 @@ +package com.hfkj.dao; + +import com.hfkj.entity.LlgBankCode; +import com.hfkj.entity.LlgBankCodeExample.Criteria; +import com.hfkj.entity.LlgBankCodeExample.Criterion; +import com.hfkj.entity.LlgBankCodeExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class LlgBankCodeSqlProvider { + + public String countByExample(LlgBankCodeExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("llg_bank_code"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(LlgBankCodeExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("llg_bank_code"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(LlgBankCode record) { + SQL sql = new SQL(); + sql.INSERT_INTO("llg_bank_code"); + + if (record.getBankCode() != null) { + sql.VALUES("bank_code", "#{bankCode,jdbcType=BIGINT}"); + } + + if (record.getBankName() != null) { + sql.VALUES("bank_name", "#{bankName,jdbcType=VARCHAR}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(LlgBankCodeExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("bank_code"); + sql.SELECT("bank_name"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("llg_bank_code"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + LlgBankCode record = (LlgBankCode) parameter.get("record"); + LlgBankCodeExample example = (LlgBankCodeExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("llg_bank_code"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getBankCode() != null) { + sql.SET("bank_code = #{record.bankCode,jdbcType=BIGINT}"); + } + + if (record.getBankName() != null) { + sql.SET("bank_name = #{record.bankName,jdbcType=VARCHAR}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("llg_bank_code"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("bank_code = #{record.bankCode,jdbcType=BIGINT}"); + sql.SET("bank_name = #{record.bankName,jdbcType=VARCHAR}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + LlgBankCodeExample example = (LlgBankCodeExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(LlgBankCode record) { + SQL sql = new SQL(); + sql.UPDATE("llg_bank_code"); + + if (record.getBankCode() != null) { + sql.SET("bank_code = #{bankCode,jdbcType=BIGINT}"); + } + + if (record.getBankName() != null) { + sql.SET("bank_name = #{bankName,jdbcType=VARCHAR}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, LlgBankCodeExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsMer.java b/service/src/main/java/com/hfkj/entity/BsMer.java index a48b6df..17d23a6 100644 --- a/service/src/main/java/com/hfkj/entity/BsMer.java +++ b/service/src/main/java/com/hfkj/entity/BsMer.java @@ -203,6 +203,11 @@ public class BsMer implements Serializable { */ private Integer merStatus; + /** + * 开通分期状态 0:未开通 1:已开通 + */ + private Boolean periodStatus; + /** * 创建业务员id */ @@ -535,6 +540,14 @@ public class BsMer implements Serializable { this.merStatus = merStatus; } + public Boolean getPeriodStatus() { + return periodStatus; + } + + public void setPeriodStatus(Boolean periodStatus) { + this.periodStatus = periodStatus; + } + public Long getCreateSalesmanId() { return createSalesmanId; } @@ -641,6 +654,7 @@ public class BsMer implements Serializable { && (this.getLarIdCardPeriodEnd() == null ? other.getLarIdCardPeriodEnd() == null : this.getLarIdCardPeriodEnd().equals(other.getLarIdCardPeriodEnd())) && (this.getCompleteStatus() == null ? other.getCompleteStatus() == null : this.getCompleteStatus().equals(other.getCompleteStatus())) && (this.getMerStatus() == null ? other.getMerStatus() == null : this.getMerStatus().equals(other.getMerStatus())) + && (this.getPeriodStatus() == null ? other.getPeriodStatus() == null : this.getPeriodStatus().equals(other.getPeriodStatus())) && (this.getCreateSalesmanId() == null ? other.getCreateSalesmanId() == null : this.getCreateSalesmanId().equals(other.getCreateSalesmanId())) && (this.getCreateSalesmanName() == null ? other.getCreateSalesmanName() == null : this.getCreateSalesmanName().equals(other.getCreateSalesmanName())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) @@ -692,6 +706,7 @@ public class BsMer implements Serializable { result = prime * result + ((getLarIdCardPeriodEnd() == null) ? 0 : getLarIdCardPeriodEnd().hashCode()); result = prime * result + ((getCompleteStatus() == null) ? 0 : getCompleteStatus().hashCode()); result = prime * result + ((getMerStatus() == null) ? 0 : getMerStatus().hashCode()); + result = prime * result + ((getPeriodStatus() == null) ? 0 : getPeriodStatus().hashCode()); result = prime * result + ((getCreateSalesmanId() == null) ? 0 : getCreateSalesmanId().hashCode()); result = prime * result + ((getCreateSalesmanName() == null) ? 0 : getCreateSalesmanName().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); @@ -746,6 +761,7 @@ public class BsMer implements Serializable { sb.append(", larIdCardPeriodEnd=").append(larIdCardPeriodEnd); sb.append(", completeStatus=").append(completeStatus); sb.append(", merStatus=").append(merStatus); + sb.append(", periodStatus=").append(periodStatus); sb.append(", createSalesmanId=").append(createSalesmanId); sb.append(", createSalesmanName=").append(createSalesmanName); sb.append(", createTime=").append(createTime); diff --git a/service/src/main/java/com/hfkj/entity/BsMerExample.java b/service/src/main/java/com/hfkj/entity/BsMerExample.java index 4834734..b8d9808 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerExample.java @@ -2675,6 +2675,66 @@ public class BsMerExample { return (Criteria) this; } + public Criteria andPeriodStatusIsNull() { + addCriterion("period_status is null"); + return (Criteria) this; + } + + public Criteria andPeriodStatusIsNotNull() { + addCriterion("period_status is not null"); + return (Criteria) this; + } + + public Criteria andPeriodStatusEqualTo(Boolean value) { + addCriterion("period_status =", value, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusNotEqualTo(Boolean value) { + addCriterion("period_status <>", value, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusGreaterThan(Boolean value) { + addCriterion("period_status >", value, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusGreaterThanOrEqualTo(Boolean value) { + addCriterion("period_status >=", value, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusLessThan(Boolean value) { + addCriterion("period_status <", value, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusLessThanOrEqualTo(Boolean value) { + addCriterion("period_status <=", value, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusIn(List values) { + addCriterion("period_status in", values, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusNotIn(List values) { + addCriterion("period_status not in", values, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusBetween(Boolean value1, Boolean value2) { + addCriterion("period_status between", value1, value2, "periodStatus"); + return (Criteria) this; + } + + public Criteria andPeriodStatusNotBetween(Boolean value1, Boolean value2) { + addCriterion("period_status not between", value1, value2, "periodStatus"); + return (Criteria) this; + } + public Criteria andCreateSalesmanIdIsNull() { addCriterion("create_salesman_id is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java index 82d9eac..4c7534b 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriod.java @@ -48,16 +48,6 @@ public class BsMerPlatformPeriod implements Serializable { */ private String platformNo; - /** - * 平台活动id - */ - private Long platformMarketId; - - /** - * 平台子活动id - */ - private Long platformPkgId; - /** * 开通银联分期 */ @@ -78,6 +68,11 @@ public class BsMerPlatformPeriod implements Serializable { */ private Integer alipayFeePaid; + /** + * 协议图片 + */ + private String agreementPics; + /** * 状态 0:不可用 1:可用 2: 审核中 3:审核驳回 */ @@ -162,22 +157,6 @@ public class BsMerPlatformPeriod implements Serializable { this.platformNo = platformNo; } - public Long getPlatformMarketId() { - return platformMarketId; - } - - public void setPlatformMarketId(Long platformMarketId) { - this.platformMarketId = platformMarketId; - } - - public Long getPlatformPkgId() { - return platformPkgId; - } - - public void setPlatformPkgId(Long platformPkgId) { - this.platformPkgId = platformPkgId; - } - public Boolean getOpenUnionpay() { return openUnionpay; } @@ -210,6 +189,14 @@ public class BsMerPlatformPeriod implements Serializable { this.alipayFeePaid = alipayFeePaid; } + public String getAgreementPics() { + return agreementPics; + } + + public void setAgreementPics(String agreementPics) { + this.agreementPics = agreementPics; + } + public Integer getStatus() { return status; } @@ -285,12 +272,11 @@ 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.getPlatformMarketId() == null ? other.getPlatformMarketId() == null : this.getPlatformMarketId().equals(other.getPlatformMarketId())) - && (this.getPlatformPkgId() == null ? other.getPlatformPkgId() == null : this.getPlatformPkgId().equals(other.getPlatformPkgId())) && (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())) && (this.getAlipayFeePaid() == null ? other.getAlipayFeePaid() == null : this.getAlipayFeePaid().equals(other.getAlipayFeePaid())) + && (this.getAgreementPics() == null ? other.getAgreementPics() == null : this.getAgreementPics().equals(other.getAgreementPics())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getSuggestionReject() == null ? other.getSuggestionReject() == null : this.getSuggestionReject().equals(other.getSuggestionReject())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) @@ -311,12 +297,11 @@ 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 + ((getPlatformMarketId() == null) ? 0 : getPlatformMarketId().hashCode()); - result = prime * result + ((getPlatformPkgId() == null) ? 0 : getPlatformPkgId().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()); result = prime * result + ((getAlipayFeePaid() == null) ? 0 : getAlipayFeePaid().hashCode()); + result = prime * result + ((getAgreementPics() == null) ? 0 : getAgreementPics().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getSuggestionReject() == null) ? 0 : getSuggestionReject().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); @@ -340,12 +325,11 @@ public class BsMerPlatformPeriod implements Serializable { sb.append(", merNo=").append(merNo); sb.append(", platformType=").append(platformType); sb.append(", platformNo=").append(platformNo); - sb.append(", platformMarketId=").append(platformMarketId); - sb.append(", platformPkgId=").append(platformPkgId); sb.append(", openUnionpay=").append(openUnionpay); sb.append(", unionpayFeePaid=").append(unionpayFeePaid); sb.append(", openAlipay=").append(openAlipay); sb.append(", alipayFeePaid=").append(alipayFeePaid); + sb.append(", agreementPics=").append(agreementPics); sb.append(", status=").append(status); sb.append(", suggestionReject=").append(suggestionReject); sb.append(", createTime=").append(createTime); diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java index fa9786c..15aa766 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodExample.java @@ -565,126 +565,6 @@ public class BsMerPlatformPeriodExample { return (Criteria) this; } - public Criteria andPlatformMarketIdIsNull() { - addCriterion("platform_market_id is null"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdIsNotNull() { - addCriterion("platform_market_id is not null"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdEqualTo(Long value) { - addCriterion("platform_market_id =", value, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdNotEqualTo(Long value) { - addCriterion("platform_market_id <>", value, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdGreaterThan(Long value) { - addCriterion("platform_market_id >", value, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdGreaterThanOrEqualTo(Long value) { - addCriterion("platform_market_id >=", value, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdLessThan(Long value) { - addCriterion("platform_market_id <", value, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdLessThanOrEqualTo(Long value) { - addCriterion("platform_market_id <=", value, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdIn(List values) { - addCriterion("platform_market_id in", values, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdNotIn(List values) { - addCriterion("platform_market_id not in", values, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdBetween(Long value1, Long value2) { - addCriterion("platform_market_id between", value1, value2, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformMarketIdNotBetween(Long value1, Long value2) { - addCriterion("platform_market_id not between", value1, value2, "platformMarketId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdIsNull() { - addCriterion("platform_pkg_id is null"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdIsNotNull() { - addCriterion("platform_pkg_id is not null"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdEqualTo(Long value) { - addCriterion("platform_pkg_id =", value, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdNotEqualTo(Long value) { - addCriterion("platform_pkg_id <>", value, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdGreaterThan(Long value) { - addCriterion("platform_pkg_id >", value, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdGreaterThanOrEqualTo(Long value) { - addCriterion("platform_pkg_id >=", value, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdLessThan(Long value) { - addCriterion("platform_pkg_id <", value, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdLessThanOrEqualTo(Long value) { - addCriterion("platform_pkg_id <=", value, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdIn(List values) { - addCriterion("platform_pkg_id in", values, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdNotIn(List values) { - addCriterion("platform_pkg_id not in", values, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdBetween(Long value1, Long value2) { - addCriterion("platform_pkg_id between", value1, value2, "platformPkgId"); - return (Criteria) this; - } - - public Criteria andPlatformPkgIdNotBetween(Long value1, Long value2) { - addCriterion("platform_pkg_id not between", value1, value2, "platformPkgId"); - return (Criteria) this; - } - public Criteria andOpenUnionpayIsNull() { addCriterion("open_unionpay is null"); return (Criteria) this; @@ -935,6 +815,76 @@ public class BsMerPlatformPeriodExample { return (Criteria) this; } + public Criteria andAgreementPicsIsNull() { + addCriterion("agreement_pics is null"); + return (Criteria) this; + } + + public Criteria andAgreementPicsIsNotNull() { + addCriterion("agreement_pics is not null"); + return (Criteria) this; + } + + public Criteria andAgreementPicsEqualTo(String value) { + addCriterion("agreement_pics =", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsNotEqualTo(String value) { + addCriterion("agreement_pics <>", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsGreaterThan(String value) { + addCriterion("agreement_pics >", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsGreaterThanOrEqualTo(String value) { + addCriterion("agreement_pics >=", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsLessThan(String value) { + addCriterion("agreement_pics <", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsLessThanOrEqualTo(String value) { + addCriterion("agreement_pics <=", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsLike(String value) { + addCriterion("agreement_pics like", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsNotLike(String value) { + addCriterion("agreement_pics not like", value, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsIn(List values) { + addCriterion("agreement_pics in", values, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsNotIn(List values) { + addCriterion("agreement_pics not in", values, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsBetween(String value1, String value2) { + addCriterion("agreement_pics between", value1, value2, "agreementPics"); + return (Criteria) this; + } + + public Criteria andAgreementPicsNotBetween(String value1, String value2) { + addCriterion("agreement_pics not between", value1, value2, "agreementPics"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("`status` 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 new file mode 100644 index 0000000..ed6a4cf --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaid.java @@ -0,0 +1,296 @@ +package com.hfkj.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * bs_mer_platform_period_paid + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class BsMerPlatformPeriodPaid implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 公司id + */ + private Long platformPeriodId; + + /** + * 商户id + */ + private Long merId; + + /** + * 内部商户号 + */ + private String merNo; + + /** + * 分期方式 1:银联 2:花呗 + */ + private Integer payType; + + /** + * 平台 1:零零购 + */ + private Integer platformType; + + /** + * 平台商户号 + */ + private String platformNo; + + /** + * 贴息方式 1:商户贴息 2:用户贴息 3:商户用户各一半 + */ + private Integer platformFeePaid; + + /** + * 平台活动id + */ + private String platformMarketId; + + /** + * 平台子活动id + */ + private String platformPkgId; + + /** + * 是否当前结算方式 + */ + private Boolean currentSettle; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getPlatformPeriodId() { + return platformPeriodId; + } + + public void setPlatformPeriodId(Long platformPeriodId) { + this.platformPeriodId = platformPeriodId; + } + + public Long getMerId() { + return merId; + } + + public void setMerId(Long merId) { + this.merId = merId; + } + + public String getMerNo() { + return merNo; + } + + public void setMerNo(String merNo) { + this.merNo = merNo; + } + + public Integer getPayType() { + return payType; + } + + public void setPayType(Integer payType) { + this.payType = payType; + } + + public Integer getPlatformType() { + return platformType; + } + + public void setPlatformType(Integer platformType) { + this.platformType = platformType; + } + + public String getPlatformNo() { + return platformNo; + } + + public void setPlatformNo(String platformNo) { + this.platformNo = platformNo; + } + + public Integer getPlatformFeePaid() { + return platformFeePaid; + } + + public void setPlatformFeePaid(Integer platformFeePaid) { + this.platformFeePaid = platformFeePaid; + } + + public String getPlatformMarketId() { + return platformMarketId; + } + + public void setPlatformMarketId(String platformMarketId) { + this.platformMarketId = platformMarketId; + } + + public String getPlatformPkgId() { + return platformPkgId; + } + + public void setPlatformPkgId(String platformPkgId) { + this.platformPkgId = platformPkgId; + } + + public Boolean getCurrentSettle() { + return currentSettle; + } + + public void setCurrentSettle(Boolean currentSettle) { + this.currentSettle = currentSettle; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + BsMerPlatformPeriodPaid other = (BsMerPlatformPeriodPaid) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getPlatformPeriodId() == null ? other.getPlatformPeriodId() == null : this.getPlatformPeriodId().equals(other.getPlatformPeriodId())) + && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) + && (this.getMerNo() == null ? other.getMerNo() == null : this.getMerNo().equals(other.getMerNo())) + && (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.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())) + && (this.getCurrentSettle() == null ? other.getCurrentSettle() == null : this.getCurrentSettle().equals(other.getCurrentSettle())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getPlatformPeriodId() == null) ? 0 : getPlatformPeriodId().hashCode()); + result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); + result = prime * result + ((getMerNo() == null) ? 0 : getMerNo().hashCode()); + 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 + ((getPlatformFeePaid() == null) ? 0 : getPlatformFeePaid().hashCode()); + result = prime * result + ((getPlatformMarketId() == null) ? 0 : getPlatformMarketId().hashCode()); + result = prime * result + ((getPlatformPkgId() == null) ? 0 : getPlatformPkgId().hashCode()); + result = prime * result + ((getCurrentSettle() == null) ? 0 : getCurrentSettle().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", platformPeriodId=").append(platformPeriodId); + sb.append(", merId=").append(merId); + sb.append(", merNo=").append(merNo); + sb.append(", payType=").append(payType); + sb.append(", platformType=").append(platformType); + sb.append(", platformNo=").append(platformNo); + sb.append(", platformFeePaid=").append(platformFeePaid); + sb.append(", platformMarketId=").append(platformMarketId); + sb.append(", platformPkgId=").append(platformPkgId); + sb.append(", currentSettle=").append(currentSettle); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaidExample.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaidExample.java new file mode 100644 index 0000000..fb5caca --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodPaidExample.java @@ -0,0 +1,1253 @@ +package com.hfkj.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BsMerPlatformPeriodPaidExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public BsMerPlatformPeriodPaidExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdIsNull() { + addCriterion("platform_period_id is null"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdIsNotNull() { + addCriterion("platform_period_id is not null"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdEqualTo(Long value) { + addCriterion("platform_period_id =", value, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdNotEqualTo(Long value) { + addCriterion("platform_period_id <>", value, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdGreaterThan(Long value) { + addCriterion("platform_period_id >", value, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdGreaterThanOrEqualTo(Long value) { + addCriterion("platform_period_id >=", value, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdLessThan(Long value) { + addCriterion("platform_period_id <", value, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdLessThanOrEqualTo(Long value) { + addCriterion("platform_period_id <=", value, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdIn(List values) { + addCriterion("platform_period_id in", values, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdNotIn(List values) { + addCriterion("platform_period_id not in", values, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdBetween(Long value1, Long value2) { + addCriterion("platform_period_id between", value1, value2, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andPlatformPeriodIdNotBetween(Long value1, Long value2) { + addCriterion("platform_period_id not between", value1, value2, "platformPeriodId"); + return (Criteria) this; + } + + public Criteria andMerIdIsNull() { + addCriterion("mer_id is null"); + return (Criteria) this; + } + + public Criteria andMerIdIsNotNull() { + addCriterion("mer_id is not null"); + return (Criteria) this; + } + + public Criteria andMerIdEqualTo(Long value) { + addCriterion("mer_id =", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotEqualTo(Long value) { + addCriterion("mer_id <>", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThan(Long value) { + addCriterion("mer_id >", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThanOrEqualTo(Long value) { + addCriterion("mer_id >=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThan(Long value) { + addCriterion("mer_id <", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThanOrEqualTo(Long value) { + addCriterion("mer_id <=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdIn(List values) { + addCriterion("mer_id in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotIn(List values) { + addCriterion("mer_id not in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdBetween(Long value1, Long value2) { + addCriterion("mer_id between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotBetween(Long value1, Long value2) { + addCriterion("mer_id not between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerNoIsNull() { + addCriterion("mer_no is null"); + return (Criteria) this; + } + + public Criteria andMerNoIsNotNull() { + addCriterion("mer_no is not null"); + return (Criteria) this; + } + + public Criteria andMerNoEqualTo(String value) { + addCriterion("mer_no =", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotEqualTo(String value) { + addCriterion("mer_no <>", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThan(String value) { + addCriterion("mer_no >", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThanOrEqualTo(String value) { + addCriterion("mer_no >=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThan(String value) { + addCriterion("mer_no <", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThanOrEqualTo(String value) { + addCriterion("mer_no <=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLike(String value) { + addCriterion("mer_no like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotLike(String value) { + addCriterion("mer_no not like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoIn(List values) { + addCriterion("mer_no in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotIn(List values) { + addCriterion("mer_no not in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoBetween(String value1, String value2) { + addCriterion("mer_no between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotBetween(String value1, String value2) { + addCriterion("mer_no not between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andPayTypeIsNull() { + addCriterion("pay_type is null"); + return (Criteria) this; + } + + public Criteria andPayTypeIsNotNull() { + addCriterion("pay_type is not null"); + return (Criteria) this; + } + + public Criteria andPayTypeEqualTo(Integer value) { + addCriterion("pay_type =", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotEqualTo(Integer value) { + addCriterion("pay_type <>", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeGreaterThan(Integer value) { + addCriterion("pay_type >", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_type >=", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeLessThan(Integer value) { + addCriterion("pay_type <", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeLessThanOrEqualTo(Integer value) { + addCriterion("pay_type <=", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeIn(List values) { + addCriterion("pay_type in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotIn(List values) { + addCriterion("pay_type not in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeBetween(Integer value1, Integer value2) { + addCriterion("pay_type between", value1, value2, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotBetween(Integer value1, Integer value2) { + addCriterion("pay_type not between", value1, value2, "payType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeIsNull() { + addCriterion("platform_type is null"); + return (Criteria) this; + } + + public Criteria andPlatformTypeIsNotNull() { + addCriterion("platform_type is not null"); + return (Criteria) this; + } + + public Criteria andPlatformTypeEqualTo(Integer value) { + addCriterion("platform_type =", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeNotEqualTo(Integer value) { + addCriterion("platform_type <>", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeGreaterThan(Integer value) { + addCriterion("platform_type >", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("platform_type >=", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeLessThan(Integer value) { + addCriterion("platform_type <", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeLessThanOrEqualTo(Integer value) { + addCriterion("platform_type <=", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeIn(List values) { + addCriterion("platform_type in", values, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeNotIn(List values) { + addCriterion("platform_type not in", values, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeBetween(Integer value1, Integer value2) { + addCriterion("platform_type between", value1, value2, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeNotBetween(Integer value1, Integer value2) { + addCriterion("platform_type not between", value1, value2, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformNoIsNull() { + addCriterion("platform_no is null"); + return (Criteria) this; + } + + public Criteria andPlatformNoIsNotNull() { + addCriterion("platform_no is not null"); + return (Criteria) this; + } + + public Criteria andPlatformNoEqualTo(String value) { + addCriterion("platform_no =", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotEqualTo(String value) { + addCriterion("platform_no <>", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoGreaterThan(String value) { + addCriterion("platform_no >", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoGreaterThanOrEqualTo(String value) { + addCriterion("platform_no >=", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoLessThan(String value) { + addCriterion("platform_no <", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoLessThanOrEqualTo(String value) { + addCriterion("platform_no <=", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoLike(String value) { + addCriterion("platform_no like", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotLike(String value) { + addCriterion("platform_no not like", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoIn(List values) { + addCriterion("platform_no in", values, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotIn(List values) { + addCriterion("platform_no not in", values, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoBetween(String value1, String value2) { + addCriterion("platform_no between", value1, value2, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotBetween(String value1, String value2) { + addCriterion("platform_no not between", value1, value2, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidIsNull() { + addCriterion("platform_fee_paid is null"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidIsNotNull() { + addCriterion("platform_fee_paid is not null"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidEqualTo(Integer value) { + addCriterion("platform_fee_paid =", value, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidNotEqualTo(Integer value) { + addCriterion("platform_fee_paid <>", value, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidGreaterThan(Integer value) { + addCriterion("platform_fee_paid >", value, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidGreaterThanOrEqualTo(Integer value) { + addCriterion("platform_fee_paid >=", value, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidLessThan(Integer value) { + addCriterion("platform_fee_paid <", value, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidLessThanOrEqualTo(Integer value) { + addCriterion("platform_fee_paid <=", value, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidIn(List values) { + addCriterion("platform_fee_paid in", values, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidNotIn(List values) { + addCriterion("platform_fee_paid not in", values, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidBetween(Integer value1, Integer value2) { + addCriterion("platform_fee_paid between", value1, value2, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformFeePaidNotBetween(Integer value1, Integer value2) { + addCriterion("platform_fee_paid not between", value1, value2, "platformFeePaid"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdIsNull() { + addCriterion("platform_market_id is null"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdIsNotNull() { + addCriterion("platform_market_id is not null"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdEqualTo(String value) { + addCriterion("platform_market_id =", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdNotEqualTo(String value) { + addCriterion("platform_market_id <>", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdGreaterThan(String value) { + addCriterion("platform_market_id >", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdGreaterThanOrEqualTo(String value) { + addCriterion("platform_market_id >=", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdLessThan(String value) { + addCriterion("platform_market_id <", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdLessThanOrEqualTo(String value) { + addCriterion("platform_market_id <=", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdLike(String value) { + addCriterion("platform_market_id like", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdNotLike(String value) { + addCriterion("platform_market_id not like", value, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdIn(List values) { + addCriterion("platform_market_id in", values, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdNotIn(List values) { + addCriterion("platform_market_id not in", values, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdBetween(String value1, String value2) { + addCriterion("platform_market_id between", value1, value2, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformMarketIdNotBetween(String value1, String value2) { + addCriterion("platform_market_id not between", value1, value2, "platformMarketId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdIsNull() { + addCriterion("platform_pkg_id is null"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdIsNotNull() { + addCriterion("platform_pkg_id is not null"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdEqualTo(String value) { + addCriterion("platform_pkg_id =", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdNotEqualTo(String value) { + addCriterion("platform_pkg_id <>", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdGreaterThan(String value) { + addCriterion("platform_pkg_id >", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdGreaterThanOrEqualTo(String value) { + addCriterion("platform_pkg_id >=", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdLessThan(String value) { + addCriterion("platform_pkg_id <", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdLessThanOrEqualTo(String value) { + addCriterion("platform_pkg_id <=", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdLike(String value) { + addCriterion("platform_pkg_id like", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdNotLike(String value) { + addCriterion("platform_pkg_id not like", value, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdIn(List values) { + addCriterion("platform_pkg_id in", values, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdNotIn(List values) { + addCriterion("platform_pkg_id not in", values, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdBetween(String value1, String value2) { + addCriterion("platform_pkg_id between", value1, value2, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andPlatformPkgIdNotBetween(String value1, String value2) { + addCriterion("platform_pkg_id not between", value1, value2, "platformPkgId"); + return (Criteria) this; + } + + public Criteria andCurrentSettleIsNull() { + addCriterion("current_settle is null"); + return (Criteria) this; + } + + public Criteria andCurrentSettleIsNotNull() { + addCriterion("current_settle is not null"); + return (Criteria) this; + } + + public Criteria andCurrentSettleEqualTo(Boolean value) { + addCriterion("current_settle =", value, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleNotEqualTo(Boolean value) { + addCriterion("current_settle <>", value, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleGreaterThan(Boolean value) { + addCriterion("current_settle >", value, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleGreaterThanOrEqualTo(Boolean value) { + addCriterion("current_settle >=", value, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleLessThan(Boolean value) { + addCriterion("current_settle <", value, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleLessThanOrEqualTo(Boolean value) { + addCriterion("current_settle <=", value, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleIn(List values) { + addCriterion("current_settle in", values, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleNotIn(List values) { + addCriterion("current_settle not in", values, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleBetween(Boolean value1, Boolean value2) { + addCriterion("current_settle between", value1, value2, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCurrentSettleNotBetween(Boolean value1, Boolean value2) { + addCriterion("current_settle not between", value1, value2, "currentSettle"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRate.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRate.java index fa9b2f6..4528559 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRate.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRate.java @@ -24,6 +24,11 @@ public class BsMerPlatformPeriodRate implements Serializable { */ private Long platformPeriodId; + /** + * 费率类型 1:银联分期费率(1类银行) 2:银联分期费率(2类银行) 3:花呗分期 + */ + private Integer periodRateType; + /** * 分期数 */ @@ -68,6 +73,14 @@ public class BsMerPlatformPeriodRate implements Serializable { this.platformPeriodId = platformPeriodId; } + public Integer getPeriodRateType() { + return periodRateType; + } + + public void setPeriodRateType(Integer periodRateType) { + this.periodRateType = periodRateType; + } + public Integer getPeriodNum() { return periodNum; } @@ -138,6 +151,7 @@ public class BsMerPlatformPeriodRate implements Serializable { BsMerPlatformPeriodRate other = (BsMerPlatformPeriodRate) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getPlatformPeriodId() == null ? other.getPlatformPeriodId() == null : this.getPlatformPeriodId().equals(other.getPlatformPeriodId())) + && (this.getPeriodRateType() == null ? other.getPeriodRateType() == null : this.getPeriodRateType().equals(other.getPeriodRateType())) && (this.getPeriodNum() == null ? other.getPeriodNum() == null : this.getPeriodNum().equals(other.getPeriodNum())) && (this.getRate() == null ? other.getRate() == null : this.getRate().equals(other.getRate())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) @@ -153,6 +167,7 @@ public class BsMerPlatformPeriodRate implements Serializable { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getPlatformPeriodId() == null) ? 0 : getPlatformPeriodId().hashCode()); + result = prime * result + ((getPeriodRateType() == null) ? 0 : getPeriodRateType().hashCode()); result = prime * result + ((getPeriodNum() == null) ? 0 : getPeriodNum().hashCode()); result = prime * result + ((getRate() == null) ? 0 : getRate().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); @@ -171,6 +186,7 @@ public class BsMerPlatformPeriodRate implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", platformPeriodId=").append(platformPeriodId); + sb.append(", periodRateType=").append(periodRateType); sb.append(", periodNum=").append(periodNum); sb.append(", rate=").append(rate); sb.append(", createTime=").append(createTime); diff --git a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRateExample.java b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRateExample.java index 6341bb6..c6f52a4 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRateExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerPlatformPeriodRateExample.java @@ -246,6 +246,66 @@ public class BsMerPlatformPeriodRateExample { return (Criteria) this; } + public Criteria andPeriodRateTypeIsNull() { + addCriterion("period_rate_type is null"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeIsNotNull() { + addCriterion("period_rate_type is not null"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeEqualTo(Integer value) { + addCriterion("period_rate_type =", value, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeNotEqualTo(Integer value) { + addCriterion("period_rate_type <>", value, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeGreaterThan(Integer value) { + addCriterion("period_rate_type >", value, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("period_rate_type >=", value, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeLessThan(Integer value) { + addCriterion("period_rate_type <", value, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeLessThanOrEqualTo(Integer value) { + addCriterion("period_rate_type <=", value, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeIn(List values) { + addCriterion("period_rate_type in", values, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeNotIn(List values) { + addCriterion("period_rate_type not in", values, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeBetween(Integer value1, Integer value2) { + addCriterion("period_rate_type between", value1, value2, "periodRateType"); + return (Criteria) this; + } + + public Criteria andPeriodRateTypeNotBetween(Integer value1, Integer value2) { + addCriterion("period_rate_type not between", value1, value2, "periodRateType"); + return (Criteria) this; + } + public Criteria andPeriodNumIsNull() { addCriterion("period_num 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 new file mode 100644 index 0000000..88d1dfe --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/LlgBankCode.java @@ -0,0 +1,135 @@ +package com.hfkj.entity; + +import java.io.Serializable; + +/** + * llg_bank_code + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class LlgBankCode implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 银行代码 + */ + private Long bankCode; + + /** + * 银行名称 + */ + private String bankName; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getBankCode() { + return bankCode; + } + + public void setBankCode(Long bankCode) { + this.bankCode = bankCode; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + LlgBankCode other = (LlgBankCode) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getBankCode() == null ? other.getBankCode() == null : this.getBankCode().equals(other.getBankCode())) + && (this.getBankName() == null ? other.getBankName() == null : this.getBankName().equals(other.getBankName())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getBankCode() == null) ? 0 : getBankCode().hashCode()); + result = prime * result + ((getBankName() == null) ? 0 : getBankName().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", bankCode=").append(bankCode); + sb.append(", bankName=").append(bankName); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/LlgBankCodeExample.java b/service/src/main/java/com/hfkj/entity/LlgBankCodeExample.java new file mode 100644 index 0000000..383b762 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/LlgBankCodeExample.java @@ -0,0 +1,622 @@ +package com.hfkj.entity; + +import java.util.ArrayList; +import java.util.List; + +public class LlgBankCodeExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public LlgBankCodeExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andBankCodeIsNull() { + addCriterion("bank_code is null"); + return (Criteria) this; + } + + public Criteria andBankCodeIsNotNull() { + addCriterion("bank_code is not null"); + return (Criteria) this; + } + + public Criteria andBankCodeEqualTo(Long value) { + addCriterion("bank_code =", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeNotEqualTo(Long value) { + addCriterion("bank_code <>", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeGreaterThan(Long value) { + addCriterion("bank_code >", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeGreaterThanOrEqualTo(Long value) { + addCriterion("bank_code >=", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeLessThan(Long value) { + addCriterion("bank_code <", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeLessThanOrEqualTo(Long value) { + addCriterion("bank_code <=", value, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeIn(List values) { + addCriterion("bank_code in", values, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeNotIn(List values) { + addCriterion("bank_code not in", values, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeBetween(Long value1, Long value2) { + addCriterion("bank_code between", value1, value2, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankCodeNotBetween(Long value1, Long value2) { + addCriterion("bank_code not between", value1, value2, "bankCode"); + return (Criteria) this; + } + + public Criteria andBankNameIsNull() { + addCriterion("bank_name is null"); + return (Criteria) this; + } + + public Criteria andBankNameIsNotNull() { + addCriterion("bank_name is not null"); + return (Criteria) this; + } + + public Criteria andBankNameEqualTo(String value) { + addCriterion("bank_name =", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameNotEqualTo(String value) { + addCriterion("bank_name <>", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameGreaterThan(String value) { + addCriterion("bank_name >", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameGreaterThanOrEqualTo(String value) { + addCriterion("bank_name >=", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameLessThan(String value) { + addCriterion("bank_name <", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameLessThanOrEqualTo(String value) { + addCriterion("bank_name <=", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameLike(String value) { + addCriterion("bank_name like", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameNotLike(String value) { + addCriterion("bank_name not like", value, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameIn(List values) { + addCriterion("bank_name in", values, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameNotIn(List values) { + addCriterion("bank_name not in", values, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameBetween(String value1, String value2) { + addCriterion("bank_name between", value1, value2, "bankName"); + return (Criteria) this; + } + + public Criteria andBankNameNotBetween(String value1, String value2) { + addCriterion("bank_name not between", value1, value2, "bankName"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/service/BsMerService.java b/service/src/main/java/com/hfkj/service/BsMerService.java index 870f33c..0d51e35 100644 --- a/service/src/main/java/com/hfkj/service/BsMerService.java +++ b/service/src/main/java/com/hfkj/service/BsMerService.java @@ -26,6 +26,12 @@ public interface BsMerService { */ void editMer(BsMer mer); + /** + * 修改商户并更新缓存 + * @param mer + */ + void update(BsMer mer); + /** * 配置商户账户 * @param merAccount 账户参数 diff --git a/service/src/main/java/com/hfkj/service/LlgBankCodeService.java b/service/src/main/java/com/hfkj/service/LlgBankCodeService.java new file mode 100644 index 0000000..e45476d --- /dev/null +++ b/service/src/main/java/com/hfkj/service/LlgBankCodeService.java @@ -0,0 +1,19 @@ +package com.hfkj.service; + +import com.hfkj.entity.LlgBankCode; + +/** + * @className: LlgBankCodeService + * @author: HuRui + * @date: 2024/1/10 + **/ +public interface LlgBankCodeService { + + /** + * 查询详情 + * @param bankName 模糊银行名称 + * @return + */ + LlgBankCode getDetail(String bankName); + +} diff --git a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java index 8889f2f..9792aaa 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java @@ -3,6 +3,7 @@ package com.hfkj.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alicp.jetcache.anno.CacheType; +import com.alicp.jetcache.anno.CacheUpdate; import com.alicp.jetcache.anno.Cached; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; @@ -90,11 +91,17 @@ public class BsMerServiceImpl implements BsMerService { mer.setUpdateTime(new Date()); merMapper.insert(mer); } else { - mer.setUpdateTime(new Date()); - merMapper.updateByPrimaryKey(mer); + update(mer); } } + @Override + @CacheUpdate(name = "MER:", key = "#mer.id", value = "#mer") + public void update(BsMer mer) { + mer.setUpdateTime(new Date()); + merMapper.updateByPrimaryKey(mer); + } + @Override @Transactional(propagation= Propagation.REQUIRES_NEW,rollbackFor= {RuntimeException.class}) public Long configMerAccount(MerAccountModel merAccount) { 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 6893f7c..bc64f5b 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderRefundServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderRefundServiceImpl.java @@ -2,6 +2,7 @@ package com.hfkj.service.impl; import com.hfkj.channel.ccb.CCBTradeService; import com.hfkj.channel.hsg.HsgIntegralService; +import com.hfkj.channel.llg.service.LLGOrderService; import com.hfkj.channel.tianque.service.TianQueTradeService; import com.hfkj.channel.weixin.WeiXinPayService; import com.hfkj.common.exception.BizException; @@ -52,6 +53,9 @@ public class BsTradeOrderRefundServiceImpl implements BsTradeOrderRefundService @Resource private TianQueTradeService tianQueTradeService; + @Resource + private LLGOrderService llgOrderService; + @Override public void editOrderRefund(BsTradeOrderRefund tradeOrderRefund) { if (tradeOrderRefund.getId() == null) { @@ -101,6 +105,9 @@ public class BsTradeOrderRefundServiceImpl implements BsTradeOrderRefundService } else if (tradeOrderRefund.getPlatformType().equals(PlatformTypeEnum.type5.getNumber())) { refund = tianQueTradeService.refund(tradeOrderRefund.getRefundNo(), tradeOrderRefund.getRefundAmount()); refundStatus = true; + } else if (tradeOrderRefund.getPlatformType().equals(PlatformTypeEnum.type6.getNumber())) { + refund = llgOrderService.refund(tradeOrderRefund.getRefundNo()); + refundStatus = true; } if (tradeOrder != null) { diff --git a/service/src/main/java/com/hfkj/service/impl/LlgBankCodeServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/LlgBankCodeServiceImpl.java new file mode 100644 index 0000000..89ad04c --- /dev/null +++ b/service/src/main/java/com/hfkj/service/impl/LlgBankCodeServiceImpl.java @@ -0,0 +1,32 @@ +package com.hfkj.service.impl; + +import com.hfkj.dao.LlgBankCodeMapper; +import com.hfkj.entity.LlgBankCode; +import com.hfkj.entity.LlgBankCodeExample; +import com.hfkj.service.LlgBankCodeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @className: LlgBankCodeServiceImpl + * @author: HuRui + * @date: 2024/1/10 + **/ +@Service("llgBankCodeService") +public class LlgBankCodeServiceImpl implements LlgBankCodeService { + + @Resource + private LlgBankCodeMapper llgBankCodeMapper; + @Override + public LlgBankCode getDetail(String bankName) { + LlgBankCodeExample example = new LlgBankCodeExample(); + example.createCriteria().andBankNameLike("%"+bankName+"%"); + List list = llgBankCodeMapper.selectByExample(example); + if (!list.isEmpty()) { + return list.get(0); + } + return null; + } +} diff --git a/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodPaidService.java b/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodPaidService.java new file mode 100644 index 0000000..635e30f --- /dev/null +++ b/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodPaidService.java @@ -0,0 +1,60 @@ +package com.hfkj.service.period; + +import com.hfkj.entity.BsMerPlatformPeriodPaid; +import com.hfkj.sysenum.MerPlatformPeriodFeePaidTypeEnum; +import com.hfkj.sysenum.MerPlatformPeriodPayTypeEnum; +import com.hfkj.sysenum.PlatformPeriodTypeEnum; + +import java.util.List; + +/** + * @className: BsMerPlatformPeriodPaidService + * @author: HuRui + * @date: 2024/1/9 + **/ +public interface BsMerPlatformPeriodPaidService { + + /** + * 编辑数据 + * @param data + */ + void editData(BsMerPlatformPeriodPaid data); + + /** + * 查询详情 + * @param merNo + * @param platformPeriodType + * @param platformPeriodFeePaidType + * @return + */ + BsMerPlatformPeriodPaid getDetail(String merNo, PlatformPeriodTypeEnum platformPeriodType, MerPlatformPeriodPayTypeEnum periodPayType, MerPlatformPeriodFeePaidTypeEnum platformPeriodFeePaidType); + + /** + * 查询列表 + * @param merNo + * @return + */ + List getList(String merNo); + + /** + * 查询列表 + * @param merNo + * @param platformPeriodType + * @return + */ + List getList(String merNo, PlatformPeriodTypeEnum platformPeriodType); + + /** + * 查询当前分期平台贴息 + * @param merNo + * @param platformPeriodType + * @return + */ + BsMerPlatformPeriodPaid getCurrenPeriodPaid(String merNo, PlatformPeriodTypeEnum platformPeriodType); + + /** + * 删除数据 + * @param merNo + */ + void delData(String merNo); +} diff --git a/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodRateService.java b/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodRateService.java new file mode 100644 index 0000000..09670fe --- /dev/null +++ b/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodRateService.java @@ -0,0 +1,42 @@ +package com.hfkj.service.period; + +import com.hfkj.entity.BsMerPlatformPeriod; +import com.hfkj.entity.BsMerPlatformPeriodRate; +import com.hfkj.sysenum.MerPlatformPeriodRateTypeEnum; + +import java.util.List; + +/** + * @className: BsMerPlatformPeriodRateService + * @author: HuRui + * @date: 2024/1/8 + **/ +public interface BsMerPlatformPeriodRateService { + + /** + * 编辑数据 + * @param data + */ + void editData(BsMerPlatformPeriodRate data); + + /** + * 查询详情 + * @param platformPeriodId + * @param periodNum + * @return + */ + BsMerPlatformPeriodRate getDetail(Long platformPeriodId, MerPlatformPeriodRateTypeEnum periodRateType, Integer periodNum); + + /** + * 查询列表 + * @param platformPeriodId + * @param periodRateType + */ + List getList(Long platformPeriodId, MerPlatformPeriodRateTypeEnum periodRateType); + + /** + * 删除数据 + * @param platformPeriodId + */ + void delData(Long platformPeriodId); +} diff --git a/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodService.java b/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodService.java index 68d0d25..e058476 100644 --- a/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodService.java +++ b/service/src/main/java/com/hfkj/service/period/BsMerPlatformPeriodService.java @@ -1,8 +1,15 @@ package com.hfkj.service.period; import com.hfkj.entity.BsMerPlatformPeriod; +import com.hfkj.entity.BsMerPlatformPeriodPaid; +import com.hfkj.entity.BsMerPlatformPeriodRate; +import com.hfkj.sysenum.MerPlatformPeriodFeePaidTypeEnum; +import com.hfkj.sysenum.MerPlatformPeriodPayTypeEnum; import com.hfkj.sysenum.PlatformPeriodTypeEnum; +import java.util.List; +import java.util.Map; + /** * @className: BsMerPlatformPeriodService * @author: HuRui @@ -16,6 +23,22 @@ public interface BsMerPlatformPeriodService { */ void editData(BsMerPlatformPeriod period); + /** + * 配置分期 + * @param period + * @param periodPaidList + */ + void configPeriod(BsMerPlatformPeriod period, List periodPaidList , List rateList) ; + + /** + * 修改分期贴息方式 + * @param merNo + * @param platformPeriodType + * @param payType + * @param feePaidType + */ + void updateFeePaid(String merNo, PlatformPeriodTypeEnum platformPeriodType, MerPlatformPeriodPayTypeEnum payType, MerPlatformPeriodFeePaidTypeEnum feePaidType) ; + /** * 申请开通分期 * @param merNo @@ -30,5 +53,19 @@ public interface BsMerPlatformPeriodService { */ BsMerPlatformPeriod getDetailByMer(String merNo, PlatformPeriodTypeEnum platformTypeEnum); + /** + * 查询详情 + * @param platformNo + * @param platformTypeEnum + * @return + */ + BsMerPlatformPeriod getDetail(String platformNo, PlatformPeriodTypeEnum platformTypeEnum); + + /** + * 查询列表 + * @param param + * @return + */ + List getList(Map param); } diff --git a/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodPaidServiceImpl.java b/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodPaidServiceImpl.java new file mode 100644 index 0000000..061cd93 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodPaidServiceImpl.java @@ -0,0 +1,86 @@ +package com.hfkj.service.period.impl; + +import com.hfkj.dao.BsMerPlatformPeriodPaidMapper; +import com.hfkj.entity.BsMerPlatformPeriodPaid; +import com.hfkj.entity.BsMerPlatformPeriodPaidExample; +import com.hfkj.service.period.BsMerPlatformPeriodPaidService; +import com.hfkj.sysenum.MerPlatformPeriodFeePaidTypeEnum; +import com.hfkj.sysenum.MerPlatformPeriodPayTypeEnum; +import com.hfkj.sysenum.PlatformPeriodTypeEnum; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @className: BsMerPlatformPeriodPaidServiceImpl + * @author: HuRui + * @date: 2024/1/9 + **/ +@Service("merPlatformPeriodPaidService") +public class BsMerPlatformPeriodPaidServiceImpl implements BsMerPlatformPeriodPaidService { + + @Resource + private BsMerPlatformPeriodPaidMapper merPlatformPeriodPaidMapper; + + @Override + public void editData(BsMerPlatformPeriodPaid data) { + if (data.getId() == null) { + data.setCreateTime(new Date()); + data.setUpdateTime(new Date()); + merPlatformPeriodPaidMapper.insert(data); + } else { + data.setUpdateTime(new Date()); + merPlatformPeriodPaidMapper.updateByPrimaryKey(data); + } + } + + @Override + public BsMerPlatformPeriodPaid getDetail(String merNo, PlatformPeriodTypeEnum platformPeriodType, MerPlatformPeriodPayTypeEnum periodPayType, MerPlatformPeriodFeePaidTypeEnum platformPeriodFeePaidType) { + BsMerPlatformPeriodPaidExample example = new BsMerPlatformPeriodPaidExample(); + example.createCriteria() + .andMerNoEqualTo(merNo) + .andPlatformTypeEqualTo(platformPeriodType.getNumber()) + .andPayTypeEqualTo(periodPayType.getNumber()) + .andPlatformFeePaidEqualTo(platformPeriodFeePaidType.getNumber()); + List list = merPlatformPeriodPaidMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } + + @Override + public List getList(String merNo) { + BsMerPlatformPeriodPaidExample example = new BsMerPlatformPeriodPaidExample(); + example.createCriteria().andMerNoEqualTo(merNo); + return merPlatformPeriodPaidMapper.selectByExample(example); + } + + @Override + public List getList(String merNo, PlatformPeriodTypeEnum platformPeriodType) { + BsMerPlatformPeriodPaidExample example = new BsMerPlatformPeriodPaidExample(); + example.createCriteria().andMerNoEqualTo(merNo).andPlatformTypeEqualTo(platformPeriodType.getNumber()); + return merPlatformPeriodPaidMapper.selectByExample(example); + } + + @Override + public BsMerPlatformPeriodPaid getCurrenPeriodPaid(String merNo, PlatformPeriodTypeEnum platformPeriodType) { + BsMerPlatformPeriodPaidExample example = new BsMerPlatformPeriodPaidExample(); + example.createCriteria().andMerNoEqualTo(merNo).andPlatformTypeEqualTo(platformPeriodType.getNumber()).andCurrentSettleEqualTo(true); + List list = merPlatformPeriodPaidMapper.selectByExample(example); + if (!list.isEmpty()) { + return list.get(0); + } + return null; + } + + @Override + public void delData(String merNo) { + BsMerPlatformPeriodPaidExample example = new BsMerPlatformPeriodPaidExample(); + example.createCriteria().andMerNoEqualTo(merNo); + merPlatformPeriodPaidMapper.deleteByExample(example); + } + +} diff --git a/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodRateServiceImpl.java b/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodRateServiceImpl.java new file mode 100644 index 0000000..51e1e3c --- /dev/null +++ b/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodRateServiceImpl.java @@ -0,0 +1,61 @@ +package com.hfkj.service.period.impl; + +import com.hfkj.dao.BsMerPlatformPeriodRateMapper; +import com.hfkj.entity.BsMerPlatformPeriodRate; +import com.hfkj.entity.BsMerPlatformPeriodRateExample; +import com.hfkj.service.period.BsMerPlatformPeriodRateService; +import com.hfkj.sysenum.MerPlatformPeriodRateTypeEnum; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @className: BsMerPlatformPeriodRateServiceImpl + * @author: HuRui + * @date: 2024/1/8 + **/ +@Service("merPlatformPeriodRateService") +public class BsMerPlatformPeriodRateServiceImpl implements BsMerPlatformPeriodRateService { + + @Resource + private BsMerPlatformPeriodRateMapper merPlatformPeriodRateMapper; + + @Override + public void editData(BsMerPlatformPeriodRate data) { + if (data.getId() == null) { + data.setCreateTime(new Date()); + data.setUpdateTime(new Date()); + merPlatformPeriodRateMapper.insert(data); + } else { + data.setUpdateTime(new Date()); + merPlatformPeriodRateMapper.updateByPrimaryKey(data); + } + } + + @Override + public BsMerPlatformPeriodRate getDetail(Long platformPeriodId, MerPlatformPeriodRateTypeEnum periodRateType, Integer periodNum) { + BsMerPlatformPeriodRateExample example = new BsMerPlatformPeriodRateExample(); + example.createCriteria().andPlatformPeriodIdEqualTo(platformPeriodId).andPeriodRateTypeEqualTo(periodRateType.getNumber()).andPeriodNumEqualTo(periodNum); + List list = merPlatformPeriodRateMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } + + @Override + public List getList(Long platformPeriodId, MerPlatformPeriodRateTypeEnum periodRateType) { + BsMerPlatformPeriodRateExample example = new BsMerPlatformPeriodRateExample(); + example.createCriteria().andPlatformPeriodIdEqualTo(platformPeriodId).andPeriodRateTypeEqualTo(periodRateType.getNumber()); + return merPlatformPeriodRateMapper.selectByExample(example); + } + + @Override + public void delData(Long platformPeriodId) { + BsMerPlatformPeriodRateExample example = new BsMerPlatformPeriodRateExample(); + example.createCriteria().andPlatformPeriodIdEqualTo(platformPeriodId); + merPlatformPeriodRateMapper.deleteByExample(example); + } +} diff --git a/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodServiceImpl.java b/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodServiceImpl.java index f90e66c..1c13659 100644 --- a/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/period/impl/BsMerPlatformPeriodServiceImpl.java @@ -1,22 +1,27 @@ package com.hfkj.service.period.impl; import com.hfkj.channel.llg.service.LLGMerService; +import com.hfkj.common.exception.BaseException; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.utils.RedisUtil; import com.hfkj.dao.BsMerPlatformPeriodMapper; -import com.hfkj.entity.BsMer; -import com.hfkj.entity.BsMerPlatformPeriod; -import com.hfkj.entity.BsMerPlatformPeriodExample; +import com.hfkj.entity.*; import com.hfkj.service.BsMerService; +import com.hfkj.service.period.BsMerPlatformPeriodPaidService; +import com.hfkj.service.period.BsMerPlatformPeriodRateService; import com.hfkj.service.period.BsMerPlatformPeriodService; -import com.hfkj.sysenum.PlatformPeriodStatusEnum; -import com.hfkj.sysenum.PlatformPeriodTypeEnum; +import com.hfkj.sysenum.*; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.Map; /** * @className: BsMerPlatformPeriodServiceImpl @@ -35,6 +40,10 @@ public class BsMerPlatformPeriodServiceImpl implements BsMerPlatformPeriodServic private RedisUtil redisUtil; @Resource private BsMerService merService; + @Resource + private BsMerPlatformPeriodPaidService merPlatformPeriodPaidService; + @Resource + private BsMerPlatformPeriodRateService merPlatformPeriodRateService; @Override public void editData(BsMerPlatformPeriod period) { @@ -48,7 +57,54 @@ public class BsMerPlatformPeriodServiceImpl implements BsMerPlatformPeriodServic } @Override - public void apply(String merNo, PlatformPeriodTypeEnum platformTypeEnum) throws Exception { + @Transactional(propagation= Propagation.REQUIRES_NEW) + public void configPeriod(BsMerPlatformPeriod period, List periodPaidList , List rateList) { + editData(period); + + merPlatformPeriodPaidService.delData(period.getMerNo()); + for (BsMerPlatformPeriodPaid periodPaid : periodPaidList) { + periodPaid.setPlatformPeriodId(period.getId()); + merPlatformPeriodPaidService.editData(periodPaid); + } + + merPlatformPeriodRateService.delData(period.getId()); + for (BsMerPlatformPeriodRate rate : rateList) { + rate.setPlatformPeriodId(period.getId()); + merPlatformPeriodRateService.editData(rate); + } + + try { + + apply(period.getMerNo(), PlatformPeriodTypeEnum.getDataByNumber(period.getPlatformType())); + + } catch (BaseException baseException) { + redisUtil.del(REDIS_FILE_KEY + period.getMerNo() + "_" + period.getPlatformType()); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, baseException.getErrorMsg()); + + } catch (Exception e) { + redisUtil.del(REDIS_FILE_KEY + period.getMerNo() + "_" + period.getPlatformType()); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知异常"); + + } + } + + @Override + @Transactional(propagation= Propagation.REQUIRES_NEW) + public void updateFeePaid(String merNo, PlatformPeriodTypeEnum platformPeriodType, MerPlatformPeriodPayTypeEnum payType, MerPlatformPeriodFeePaidTypeEnum feePaidType) { + // 查询 + List list = merPlatformPeriodPaidService.getList(merNo); + for (BsMerPlatformPeriodPaid paid : list) { + if (paid.getPlatformFeePaid().equals(feePaidType.getNumber())) { + paid.setCurrentSettle(true); + } else { + paid.setCurrentSettle(false); + } + merPlatformPeriodPaidService.editData(paid); + } + } + + @Override + public void apply(String merNo, PlatformPeriodTypeEnum platformTypeEnum) throws BaseException { // 查询商户 BsMer mer = merService.getMer(merNo); if (mer == null) { @@ -56,8 +112,9 @@ public class BsMerPlatformPeriodServiceImpl implements BsMerPlatformPeriodServic } if (platformTypeEnum.getNumber().equals(PlatformPeriodTypeEnum.type1.getNumber())) { llgMerService.merApply(mer.getId()); + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的渠道"); } - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的渠道"); } @Override @@ -70,7 +127,7 @@ public class BsMerPlatformPeriodServiceImpl implements BsMerPlatformPeriodServic example.createCriteria() .andMerNoEqualTo(merNo) .andPlatformTypeEqualTo(platformTypeEnum.getNumber()) - .andStatusEqualTo(PlatformPeriodStatusEnum.status1.getNumber()); + .andStatusNotEqualTo(PlatformPeriodStatusEnum.status0.getNumber()); List list = merPlatformPeriodMapper.selectByExample(example); if (!list.isEmpty()) { BsMerPlatformPeriod period = list.get(0); @@ -79,4 +136,31 @@ public class BsMerPlatformPeriodServiceImpl implements BsMerPlatformPeriodServic } return null; } + + @Override + public BsMerPlatformPeriod getDetail(String platformNo, PlatformPeriodTypeEnum platformTypeEnum) { + BsMerPlatformPeriodExample example = new BsMerPlatformPeriodExample(); + example.createCriteria() + .andPlatformNoEqualTo(platformNo) + .andPlatformTypeEqualTo(platformTypeEnum.getNumber()) + .andStatusNotEqualTo(PlatformPeriodStatusEnum.status0.getNumber()); + List list = merPlatformPeriodMapper.selectByExample(example); + if (!list.isEmpty()) { + return list.get(0); + } + return null; + } + + @Override + public List getList(Map param) { + BsMerPlatformPeriodExample example = new BsMerPlatformPeriodExample(); + BsMerPlatformPeriodExample.Criteria criteria = example.createCriteria(); + + if (MapUtils.getInteger(param, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(param, "status")); + } + + example.setOrderByClause("create_time desc"); + return merPlatformPeriodMapper.selectByExample(example); + } } diff --git a/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodFeePaidTypeEnum.java b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodFeePaidTypeEnum.java new file mode 100644 index 0000000..9dbd6fa --- /dev/null +++ b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodFeePaidTypeEnum.java @@ -0,0 +1,49 @@ +package com.hfkj.sysenum; + +import java.util.Objects; + +/** + * 分期平台类型 + * @author hurui + */ +public enum MerPlatformPeriodFeePaidTypeEnum { + type1(1, "商户贴息"), + type2(2, "用户贴息"), + type3(3, "商户用户各一半"), + ; + + + private Integer number; + + private String name; + + MerPlatformPeriodFeePaidTypeEnum(int number, String name) { + this.number = number; + this.name = name; + } + + public static MerPlatformPeriodFeePaidTypeEnum getDataByNumber(Integer number) { + for (MerPlatformPeriodFeePaidTypeEnum ele : values()) { + if (Objects.equals(number,ele.getNumber())) { + return ele; + } + } + return null; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodPayTypeEnum.java b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodPayTypeEnum.java new file mode 100644 index 0000000..6f0cfb8 --- /dev/null +++ b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodPayTypeEnum.java @@ -0,0 +1,48 @@ +package com.hfkj.sysenum; + +import java.util.Objects; + +/** + * 分期平台类型 + * @author hurui + */ +public enum MerPlatformPeriodPayTypeEnum { + type1(1, "银联分期"), + /*type2(2, "花呗分期"),*/ + ; + + + private Integer number; + + private String name; + + MerPlatformPeriodPayTypeEnum(int number, String name) { + this.number = number; + this.name = name; + } + + public static MerPlatformPeriodPayTypeEnum getDataByNumber(Integer number) { + for (MerPlatformPeriodPayTypeEnum ele : values()) { + if (Objects.equals(number,ele.getNumber())) { + return ele; + } + } + return null; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodRateTypeEnum.java b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodRateTypeEnum.java new file mode 100644 index 0000000..69e13ad --- /dev/null +++ b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodRateTypeEnum.java @@ -0,0 +1,49 @@ +package com.hfkj.sysenum; + +import java.util.Objects; + +/** + * 分期平台类型 + * @author hurui + */ +public enum MerPlatformPeriodRateTypeEnum { + type1(1, "银联分期费率(1类银行)"), + type2(2, "银联分期费率(2类银行)"), + type3(3, "花呗分期费率"), + ; + + + private Integer number; + + private String name; + + MerPlatformPeriodRateTypeEnum(int number, String name) { + this.number = number; + this.name = name; + } + + public static MerPlatformPeriodRateTypeEnum getDataByNumber(Integer number) { + for (MerPlatformPeriodRateTypeEnum ele : values()) { + if (Objects.equals(number,ele.getNumber())) { + return ele; + } + } + return null; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodStatusEnum.java b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodStatusEnum.java new file mode 100644 index 0000000..31fe301 --- /dev/null +++ b/service/src/main/java/com/hfkj/sysenum/MerPlatformPeriodStatusEnum.java @@ -0,0 +1,50 @@ +package com.hfkj.sysenum; + +import java.util.Objects; + +/** + * 分期平台类型 + * @author hurui + */ +public enum MerPlatformPeriodStatusEnum { + status0(0, "不可用"), + status1(1, "正常"), + status2(2, "审核中"), + status3(3, "审核驳回"), + ; + + + private Integer number; + + private String name; + + MerPlatformPeriodStatusEnum(int number, String name) { + this.number = number; + this.name = name; + } + + public static MerPlatformPeriodStatusEnum getDataByNumber(Integer number) { + for (MerPlatformPeriodStatusEnum ele : values()) { + if (Objects.equals(number,ele.getNumber())) { + return ele; + } + } + return null; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/service/src/main/java/com/hfkj/sysenum/PlatformPeriodTypeEnum.java b/service/src/main/java/com/hfkj/sysenum/PlatformPeriodTypeEnum.java index 2d86701..b4f56ec 100644 --- a/service/src/main/java/com/hfkj/sysenum/PlatformPeriodTypeEnum.java +++ b/service/src/main/java/com/hfkj/sysenum/PlatformPeriodTypeEnum.java @@ -1,5 +1,6 @@ package com.hfkj.sysenum; +import java.util.List; import java.util.Objects; /**