diff --git a/bweb/src/main/java/com/bweb/controller/BsTradeOrderController.java b/bweb/src/main/java/com/bweb/controller/BsTradeOrderController.java index b2815dd..0596d9e 100644 --- a/bweb/src/main/java/com/bweb/controller/BsTradeOrderController.java +++ b/bweb/src/main/java/com/bweb/controller/BsTradeOrderController.java @@ -253,4 +253,33 @@ public class BsTradeOrderController { } } + + @RequestMapping(value="/queryCheckingDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据交易订单号 查询订单信息") + public ResponseData queryCheckingDetail(@RequestParam(value = "outTradeOrder" , required = true) String outTradeOrder) { + try { + + return ResponseMsgUtil.success(""); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getOrderByOutTradeOrder",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据交易订单号 查询订单信息") + public ResponseData queryChecking(@RequestParam(value = "outTradeOrder" , required = true) String outTradeOrder) { + try { + + return ResponseMsgUtil.success(""); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + } diff --git a/cweb/src/main/java/com/cweb/controller/BsMerController.java b/cweb/src/main/java/com/cweb/controller/BsMerController.java index 65a1c28..4e31412 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerController.java @@ -577,6 +577,55 @@ public class BsMerController { } } + @RequestMapping(value="/getMerList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询商户列表") + public ResponseData getMerList(@RequestParam(value = "agentId" , required = false) Long agentId, + @RequestParam(value = "salesmanId" , required = false) Long salesmanId, + @RequestParam(value = "merType" , required = false) Integer merType, + @RequestParam(value = "merNo" , required = false) String merNo, + @RequestParam(value = "merName" , required = false) String merName, + @RequestParam(value = "regName" , required = false) String regName, + @RequestParam(value = "regPhone" , required = false) String regPhone, + @RequestParam(value = "merStatus" , required = false) Integer merStatus, + @RequestParam(value = "pageNum" , required = true) Integer pageNum, + @RequestParam(value = "pageSize" , required = true) Integer pageSize + ) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + + Map map = new HashMap<>(); + map.put("merType", merType); + map.put("merNo", merNo); + map.put("merName", merName); + map.put("merStatus", merStatus); + map.put("regName", regName); + map.put("regPhone", regPhone); + + if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) { + map.put("agentId", agentId); + map.put("salesmanId", salesmanId); + } + + if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) { + map.put("agentId", userModel.getAgent().getId()); + map.put("salesmanId", salesmanId); + } + + if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) { + map.put("salesmanId", userModel.getSalesman().getId()); + } + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(merService.getMerList(map))); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/uploadfile",method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "文件上传") diff --git a/cweb/src/main/java/com/cweb/controller/BsSalesmanController.java b/cweb/src/main/java/com/cweb/controller/BsSalesmanController.java index b223c14..da72a2a 100644 --- a/cweb/src/main/java/com/cweb/controller/BsSalesmanController.java +++ b/cweb/src/main/java/com/cweb/controller/BsSalesmanController.java @@ -80,4 +80,28 @@ public class BsSalesmanController { } } + @RequestMapping(value = "/querySalesmanList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询业务员列表") + public ResponseData querySalesmanList(@RequestParam(value = "agentId", required = false) String agentId, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "phone", required = false) String phone, + @RequestParam(value = "status", required = false) Integer status, + @RequestParam(value = "pageNum", required = true) Integer pageNum, + @RequestParam(value = "pageSize", required = true) Integer pageSize) { + try { + + Map param = new HashMap<>(); + param.put("agentId", agentId); + param.put("name", name); + param.put("phone", phone); + param.put("status", status); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(salesmanService.getSalesmanList(param))); + } catch (Exception e) { + log.error("BsSalesmanController --> querySalesmanList() error!", e); + return ResponseMsgUtil.exception(e); + } + } } diff --git a/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java b/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java index 4a895ab..258c8f2 100644 --- a/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java +++ b/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java @@ -2,6 +2,7 @@ package com.hfkj.schedule; import com.alibaba.fastjson.JSONObject; import com.hfkj.channel.lakala.LaKaLaTradeSeparateService; +import com.hfkj.channel.lakala.LaKaLaTradeService; import com.hfkj.channel.weixin.utils.WxOrderConfig; import com.hfkj.entity.BsTradeOrder; import com.hfkj.entity.BsTradeOrderProfitSharing; @@ -39,6 +40,12 @@ public class TradeOrderSchedule { @Resource private LaKaLaTradeSeparateService laKaLaTradeSeparateService; + @Resource + private BsTradeOrderService tradeOrderService; + + @Resource + private LaKaLaTradeService laKaLaTradeService; + /** * 订单发起分账 * 5分钟扫描一次需要分账的订单 @@ -247,4 +254,30 @@ public class TradeOrderSchedule { } } + /** + * 交易结算 + * 每分钟扫描一次 + */ + @Scheduled(cron="0 0/1 * * * ?") + public void tradeOrderSettle() { + Map param = new HashMap<>(); + param.put("status", "3"); + param.put("settleAmountIsNull", true); + List tradeOrderList = tradeOrderService.getTradeOrderList(param); + for (BsTradeOrder tradeOrder : tradeOrderList) { + try { + // 查询手续费 + JSONObject queryTrans = laKaLaTradeService.queryTrans(tradeOrder.getOutTradeNo()); + if (queryTrans != null && queryTrans.getString("trade_state").equals("03")) { + tradeOrder.setShdFeeAmt(queryTrans.getBigDecimal("fee_amount")); + tradeOrder.setSettleAmount(queryTrans.getBigDecimal("settle_amount")); + tradeOrder.setSettleDate(queryTrans.getDate("clear_date")); + tradeOrderService.editOrder(tradeOrder); + } + } catch (Exception e) { + + } + } + } + } diff --git a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaLedgerService.java b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaLedgerService.java index cce9302..ca9baad 100644 --- a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaLedgerService.java +++ b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaLedgerService.java @@ -103,14 +103,19 @@ public class LaKaLaLedgerService { BsMerLedgerApply merLedgerApply = new BsMerLedgerApply(); merLedgerApply.setMerLedgerId(merLedger.getId()); - merLedgerApply.setMerId(merLedger.getId()); + merLedgerApply.setMerId(merLedger.getMerId()); merLedgerApply.setOrderNo(orderNo); merLedgerApply.setRequestBody(JSONObject.toJSONString(requestMap)); JSONObject responseBody = HttpsUtils.doPost(CommonSysConst.getSysConfig().getLkl_request_url() + "/api/v2/mms/openApi/ledger/applyLedgerMer", commonParam, heard); if (!responseBody.getString("retCode").equals("000000")) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("retMsg")); + } + + merLedger.setStatus(MerLedgerStatusEnum.status2.getNumber()); + merLedgerService.editMerLedger(merLedger); + System.out.println("body：" + JSONObject.toJSONString(commonParam)); System.out.println("response：" + responseBody.toJSONString()); merLedgerApply.setApplyId(responseBody.getJSONObject("respData").getString("applyId")); diff --git a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaTradeService.java b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaTradeService.java index 382e046..4d20eae 100644 --- a/service/src/main/java/com/hfkj/channel/lakala/LaKaLaTradeService.java +++ b/service/src/main/java/com/hfkj/channel/lakala/LaKaLaTradeService.java @@ -286,53 +286,58 @@ public class LaKaLaTradeService { * 商户计费查询 * @param tradeNo 订单号 */ - public Map queryTrans(String tradeNo) { + public JSONObject queryTrans(String tradeNo) { log.info("========= Start 商户计费查询 Start ==========="); - // 查询交易订单 - BsTradeOrder order = tradeOrderService.getOrderByOutTradeNo(tradeNo); - if (order == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到交易订单"); - } - // 查询商户号 - BsMerPlatformNo platformNo = merPlatformNoService.getPlatformNo(order.getMerId(), PlatformTypeEnum.type1); - if (platformNo == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户号"); - } - // 查询终端号 - BsMerPlatformTerm merPlatformTerm = merPlatformTermService.getMerPlatformTerm(platformNo.getId(), "WECHAT_PAY"); - if (merPlatformTerm == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户终端号"); - } - - Map commonParam = new HashMap<>(); - commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss")); - commonParam.put("version", "3.0"); - commonParam.put("out_org_code", CommonSysConst.getSysConfig().getLkl_v3_appid()); - - Map map = new HashMap<>(); - map.put("merchant_no", platformNo.getCupNo()); - map.put("term_no", merPlatformTerm.getTermNo()); - map.put("log_no", order.getPlatformLogNo()); - commonParam.put("req_data", map); - - Map reqParam = LaKaLaConfig.generateSignParamsV3(JSONObject.parseObject(JSONObject.toJSONString(commonParam))); - - // 头部参数 - Map heard = new HashMap<>(); - heard.put("Authorization", reqParam.get("Authorization")); + try { + // 查询交易订单 + BsTradeOrder order = tradeOrderService.getOrderByOutTradeNo(tradeNo); + if (order == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到交易订单"); + } + // 查询商户号 + BsMerPlatformNo platformNo = merPlatformNoService.getPlatformNo(order.getMerId(), PlatformTypeEnum.type1); + if (platformNo == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户号"); + } + // 查询终端号 + BsMerPlatformTerm merPlatformTerm = merPlatformTermService.getMerPlatformTerm(platformNo.getId(), "WECHAT_PAY"); + if (merPlatformTerm == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户终端号"); + } + Map commonParam = new HashMap<>(); + commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss")); + commonParam.put("version", "3.0"); + commonParam.put("out_org_code", CommonSysConst.getSysConfig().getLkl_v3_appid()); + + Map map = new HashMap<>(); + map.put("merchant_no", platformNo.getCupNo()); + map.put("term_no", merPlatformTerm.getTermNo()); + map.put("log_no", order.getPlatformLogNo()); + commonParam.put("req_data", map); + + Map reqParam = LaKaLaConfig.generateSignParamsV3(JSONObject.parseObject(JSONObject.toJSONString(commonParam))); + + // 头部参数 + Map heard = new HashMap<>(); + heard.put("Authorization", reqParam.get("Authorization")); + + // 请求记录 + // 请求拉卡拉接口 + JSONObject responseBody = HttpsUtils.doPost(CommonSysConst.getSysConfig().getLkl_request_url() + "/api/v3/lams/merchant/query_trans", commonParam, heard); + log.info("请求参数："+ JSONObject.toJSONString(commonParam)); + log.info("响应参数："+ JSONObject.toJSONString(responseBody)); + System.out.println("请求参数："+ JSONObject.toJSONString(commonParam)); + System.out.println("响应参数："+ JSONObject.toJSONString(responseBody)); + if (!responseBody.getString("code").equals("000000")) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("msg")); + } + return responseBody.getJSONObject("resp_data"); - // 请求记录 - // 请求拉卡拉接口 - JSONObject responseBody = HttpsUtils.doPost(CommonSysConst.getSysConfig().getLkl_request_url() + "/api/v3/lams/merchant/query_trans", commonParam, heard); - log.info("请求参数："+ JSONObject.toJSONString(commonParam)); - log.info("响应参数："+ JSONObject.toJSONString(responseBody)); - System.out.println("请求参数："+ JSONObject.toJSONString(commonParam)); - System.out.println("响应参数："+ JSONObject.toJSONString(responseBody)); - if (!responseBody.getString("code").equals("000000")) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("msg")); - }; - log.info("========= END 商户计费查询 END ==========="); - return responseBody.getJSONObject("resp_data"); + } catch (Exception e) { + return null; + } finally { + log.info("========= END 商户计费查询 END ==========="); + } } diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java index 3a25f41..7397734 100644 --- a/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderMapper.java @@ -61,12 +61,13 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "user_discount_price, user_discount_actual_price, ", "trade_actual_amount, income_amout, ", "acc_trade_no, acc_mdiscount_amount, ", - "acc_discount_amount, acc_payment_code, ", + "acc_discount_amount, shd_fee_amt, ", + "fee_rate, settle_amount, ", + "settle_date, acc_payment_code, ", "card_type, `status`, ", "profit_sharing_status, pay_time, ", "timeout_express, subject, ", - "pay_notify_url, shd_fee_amt, ", - "fee_rate, attach, ", + "pay_notify_url, attach, ", "refund_type, refund_price, ", "create_type, create_time, ", "cancel_time, update_time, ", @@ -93,12 +94,13 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "#{userDiscountPrice,jdbcType=DECIMAL}, #{userDiscountActualPrice,jdbcType=DECIMAL}, ", "#{tradeActualAmount,jdbcType=DECIMAL}, #{incomeAmout,jdbcType=DECIMAL}, ", "#{accTradeNo,jdbcType=VARCHAR}, #{accMdiscountAmount,jdbcType=DECIMAL}, ", - "#{accDiscountAmount,jdbcType=DECIMAL}, #{accPaymentCode,jdbcType=VARCHAR}, ", + "#{accDiscountAmount,jdbcType=DECIMAL}, #{shdFeeAmt,jdbcType=DECIMAL}, ", + "#{feeRate,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, ", + "#{settleDate,jdbcType=TIMESTAMP}, #{accPaymentCode,jdbcType=VARCHAR}, ", "#{cardType,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{profitSharingStatus,jdbcType=BIT}, #{payTime,jdbcType=TIMESTAMP}, ", "#{timeoutExpress,jdbcType=INTEGER}, #{subject,jdbcType=VARCHAR}, ", - "#{payNotifyUrl,jdbcType=VARCHAR}, #{shdFeeAmt,jdbcType=DECIMAL}, ", - "#{feeRate,jdbcType=DECIMAL}, #{attach,jdbcType=VARCHAR}, ", + "#{payNotifyUrl,jdbcType=VARCHAR}, #{attach,jdbcType=VARCHAR}, ", "#{refundType,jdbcType=INTEGER}, #{refundPrice,jdbcType=DECIMAL}, ", "#{createType,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", "#{cancelTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", @@ -160,6 +162,10 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { @Result(column="acc_trade_no", property="accTradeNo", jdbcType=JdbcType.VARCHAR), @Result(column="acc_mdiscount_amount", property="accMdiscountAmount", jdbcType=JdbcType.DECIMAL), @Result(column="acc_discount_amount", property="accDiscountAmount", jdbcType=JdbcType.DECIMAL), + @Result(column="shd_fee_amt", property="shdFeeAmt", jdbcType=JdbcType.DECIMAL), + @Result(column="fee_rate", property="feeRate", jdbcType=JdbcType.DECIMAL), + @Result(column="settle_amount", property="settleAmount", jdbcType=JdbcType.DECIMAL), + @Result(column="settle_date", property="settleDate", jdbcType=JdbcType.TIMESTAMP), @Result(column="acc_payment_code", property="accPaymentCode", jdbcType=JdbcType.VARCHAR), @Result(column="card_type", property="cardType", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @@ -168,8 +174,6 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { @Result(column="timeout_express", property="timeoutExpress", jdbcType=JdbcType.INTEGER), @Result(column="subject", property="subject", jdbcType=JdbcType.VARCHAR), @Result(column="pay_notify_url", property="payNotifyUrl", jdbcType=JdbcType.VARCHAR), - @Result(column="shd_fee_amt", property="shdFeeAmt", jdbcType=JdbcType.DECIMAL), - @Result(column="fee_rate", property="feeRate", jdbcType=JdbcType.DECIMAL), @Result(column="attach", property="attach", jdbcType=JdbcType.VARCHAR), @Result(column="refund_type", property="refundType", jdbcType=JdbcType.INTEGER), @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL), @@ -194,10 +198,10 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "store_discount_actual_price, store_discount_profit_price, user_id, user_phone, ", "user_discount_id, user_discount_name, user_discount_type, user_discount_price, ", "user_discount_actual_price, trade_actual_amount, income_amout, acc_trade_no, ", - "acc_mdiscount_amount, acc_discount_amount, acc_payment_code, card_type, `status`, ", - "profit_sharing_status, pay_time, timeout_express, subject, pay_notify_url, shd_fee_amt, ", - "fee_rate, attach, refund_type, refund_price, create_type, create_time, cancel_time, ", - "update_time, ext_1, ext_2, ext_3", + "acc_mdiscount_amount, acc_discount_amount, shd_fee_amt, fee_rate, settle_amount, ", + "settle_date, acc_payment_code, card_type, `status`, profit_sharing_status, pay_time, ", + "timeout_express, subject, pay_notify_url, attach, refund_type, refund_price, ", + "create_type, create_time, cancel_time, update_time, ext_1, ext_2, ext_3", "from bs_trade_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -249,6 +253,10 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { @Result(column="acc_trade_no", property="accTradeNo", jdbcType=JdbcType.VARCHAR), @Result(column="acc_mdiscount_amount", property="accMdiscountAmount", jdbcType=JdbcType.DECIMAL), @Result(column="acc_discount_amount", property="accDiscountAmount", jdbcType=JdbcType.DECIMAL), + @Result(column="shd_fee_amt", property="shdFeeAmt", jdbcType=JdbcType.DECIMAL), + @Result(column="fee_rate", property="feeRate", jdbcType=JdbcType.DECIMAL), + @Result(column="settle_amount", property="settleAmount", jdbcType=JdbcType.DECIMAL), + @Result(column="settle_date", property="settleDate", jdbcType=JdbcType.TIMESTAMP), @Result(column="acc_payment_code", property="accPaymentCode", jdbcType=JdbcType.VARCHAR), @Result(column="card_type", property="cardType", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @@ -257,8 +265,6 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { @Result(column="timeout_express", property="timeoutExpress", jdbcType=JdbcType.INTEGER), @Result(column="subject", property="subject", jdbcType=JdbcType.VARCHAR), @Result(column="pay_notify_url", property="payNotifyUrl", jdbcType=JdbcType.VARCHAR), - @Result(column="shd_fee_amt", property="shdFeeAmt", jdbcType=JdbcType.DECIMAL), - @Result(column="fee_rate", property="feeRate", jdbcType=JdbcType.DECIMAL), @Result(column="attach", property="attach", jdbcType=JdbcType.VARCHAR), @Result(column="refund_type", property="refundType", jdbcType=JdbcType.INTEGER), @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL), @@ -329,6 +335,10 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "acc_trade_no = #{accTradeNo,jdbcType=VARCHAR},", "acc_mdiscount_amount = #{accMdiscountAmount,jdbcType=DECIMAL},", "acc_discount_amount = #{accDiscountAmount,jdbcType=DECIMAL},", + "shd_fee_amt = #{shdFeeAmt,jdbcType=DECIMAL},", + "fee_rate = #{feeRate,jdbcType=DECIMAL},", + "settle_amount = #{settleAmount,jdbcType=DECIMAL},", + "settle_date = #{settleDate,jdbcType=TIMESTAMP},", "acc_payment_code = #{accPaymentCode,jdbcType=VARCHAR},", "card_type = #{cardType,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", @@ -337,8 +347,6 @@ public interface BsTradeOrderMapper extends BsTradeOrderMapperExt { "timeout_express = #{timeoutExpress,jdbcType=INTEGER},", "subject = #{subject,jdbcType=VARCHAR},", "pay_notify_url = #{payNotifyUrl,jdbcType=VARCHAR},", - "shd_fee_amt = #{shdFeeAmt,jdbcType=DECIMAL},", - "fee_rate = #{feeRate,jdbcType=DECIMAL},", "attach = #{attach,jdbcType=VARCHAR},", "refund_type = #{refundType,jdbcType=INTEGER},", "refund_price = #{refundPrice,jdbcType=DECIMAL},", diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java index b445041..bc4314b 100644 --- a/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderSqlProvider.java @@ -212,6 +212,22 @@ public class BsTradeOrderSqlProvider { sql.VALUES("acc_discount_amount", "#{accDiscountAmount,jdbcType=DECIMAL}"); } + if (record.getShdFeeAmt() != null) { + sql.VALUES("shd_fee_amt", "#{shdFeeAmt,jdbcType=DECIMAL}"); + } + + if (record.getFeeRate() != null) { + sql.VALUES("fee_rate", "#{feeRate,jdbcType=DECIMAL}"); + } + + if (record.getSettleAmount() != null) { + sql.VALUES("settle_amount", "#{settleAmount,jdbcType=DECIMAL}"); + } + + if (record.getSettleDate() != null) { + sql.VALUES("settle_date", "#{settleDate,jdbcType=TIMESTAMP}"); + } + if (record.getAccPaymentCode() != null) { sql.VALUES("acc_payment_code", "#{accPaymentCode,jdbcType=VARCHAR}"); } @@ -244,14 +260,6 @@ public class BsTradeOrderSqlProvider { sql.VALUES("pay_notify_url", "#{payNotifyUrl,jdbcType=VARCHAR}"); } - if (record.getShdFeeAmt() != null) { - sql.VALUES("shd_fee_amt", "#{shdFeeAmt,jdbcType=DECIMAL}"); - } - - if (record.getFeeRate() != null) { - sql.VALUES("fee_rate", "#{feeRate,jdbcType=DECIMAL}"); - } - if (record.getAttach() != null) { sql.VALUES("attach", "#{attach,jdbcType=VARCHAR}"); } @@ -348,6 +356,10 @@ public class BsTradeOrderSqlProvider { sql.SELECT("acc_trade_no"); sql.SELECT("acc_mdiscount_amount"); sql.SELECT("acc_discount_amount"); + sql.SELECT("shd_fee_amt"); + sql.SELECT("fee_rate"); + sql.SELECT("settle_amount"); + sql.SELECT("settle_date"); sql.SELECT("acc_payment_code"); sql.SELECT("card_type"); sql.SELECT("`status`"); @@ -356,8 +368,6 @@ public class BsTradeOrderSqlProvider { sql.SELECT("timeout_express"); sql.SELECT("subject"); sql.SELECT("pay_notify_url"); - sql.SELECT("shd_fee_amt"); - sql.SELECT("fee_rate"); sql.SELECT("attach"); sql.SELECT("refund_type"); sql.SELECT("refund_price"); @@ -573,6 +583,22 @@ public class BsTradeOrderSqlProvider { sql.SET("acc_discount_amount = #{record.accDiscountAmount,jdbcType=DECIMAL}"); } + if (record.getShdFeeAmt() != null) { + sql.SET("shd_fee_amt = #{record.shdFeeAmt,jdbcType=DECIMAL}"); + } + + if (record.getFeeRate() != null) { + sql.SET("fee_rate = #{record.feeRate,jdbcType=DECIMAL}"); + } + + if (record.getSettleAmount() != null) { + sql.SET("settle_amount = #{record.settleAmount,jdbcType=DECIMAL}"); + } + + if (record.getSettleDate() != null) { + sql.SET("settle_date = #{record.settleDate,jdbcType=TIMESTAMP}"); + } + if (record.getAccPaymentCode() != null) { sql.SET("acc_payment_code = #{record.accPaymentCode,jdbcType=VARCHAR}"); } @@ -605,14 +631,6 @@ public class BsTradeOrderSqlProvider { sql.SET("pay_notify_url = #{record.payNotifyUrl,jdbcType=VARCHAR}"); } - if (record.getShdFeeAmt() != null) { - sql.SET("shd_fee_amt = #{record.shdFeeAmt,jdbcType=DECIMAL}"); - } - - if (record.getFeeRate() != null) { - sql.SET("fee_rate = #{record.feeRate,jdbcType=DECIMAL}"); - } - if (record.getAttach() != null) { sql.SET("attach = #{record.attach,jdbcType=VARCHAR}"); } @@ -708,6 +726,10 @@ public class BsTradeOrderSqlProvider { sql.SET("acc_trade_no = #{record.accTradeNo,jdbcType=VARCHAR}"); sql.SET("acc_mdiscount_amount = #{record.accMdiscountAmount,jdbcType=DECIMAL}"); sql.SET("acc_discount_amount = #{record.accDiscountAmount,jdbcType=DECIMAL}"); + sql.SET("shd_fee_amt = #{record.shdFeeAmt,jdbcType=DECIMAL}"); + sql.SET("fee_rate = #{record.feeRate,jdbcType=DECIMAL}"); + sql.SET("settle_amount = #{record.settleAmount,jdbcType=DECIMAL}"); + sql.SET("settle_date = #{record.settleDate,jdbcType=TIMESTAMP}"); sql.SET("acc_payment_code = #{record.accPaymentCode,jdbcType=VARCHAR}"); sql.SET("card_type = #{record.cardType,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); @@ -716,8 +738,6 @@ public class BsTradeOrderSqlProvider { sql.SET("timeout_express = #{record.timeoutExpress,jdbcType=INTEGER}"); sql.SET("subject = #{record.subject,jdbcType=VARCHAR}"); sql.SET("pay_notify_url = #{record.payNotifyUrl,jdbcType=VARCHAR}"); - sql.SET("shd_fee_amt = #{record.shdFeeAmt,jdbcType=DECIMAL}"); - sql.SET("fee_rate = #{record.feeRate,jdbcType=DECIMAL}"); sql.SET("attach = #{record.attach,jdbcType=VARCHAR}"); sql.SET("refund_type = #{record.refundType,jdbcType=INTEGER}"); sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}"); @@ -922,6 +942,22 @@ public class BsTradeOrderSqlProvider { sql.SET("acc_discount_amount = #{accDiscountAmount,jdbcType=DECIMAL}"); } + if (record.getShdFeeAmt() != null) { + sql.SET("shd_fee_amt = #{shdFeeAmt,jdbcType=DECIMAL}"); + } + + if (record.getFeeRate() != null) { + sql.SET("fee_rate = #{feeRate,jdbcType=DECIMAL}"); + } + + if (record.getSettleAmount() != null) { + sql.SET("settle_amount = #{settleAmount,jdbcType=DECIMAL}"); + } + + if (record.getSettleDate() != null) { + sql.SET("settle_date = #{settleDate,jdbcType=TIMESTAMP}"); + } + if (record.getAccPaymentCode() != null) { sql.SET("acc_payment_code = #{accPaymentCode,jdbcType=VARCHAR}"); } @@ -954,14 +990,6 @@ public class BsTradeOrderSqlProvider { sql.SET("pay_notify_url = #{payNotifyUrl,jdbcType=VARCHAR}"); } - if (record.getShdFeeAmt() != null) { - sql.SET("shd_fee_amt = #{shdFeeAmt,jdbcType=DECIMAL}"); - } - - if (record.getFeeRate() != null) { - sql.SET("fee_rate = #{feeRate,jdbcType=DECIMAL}"); - } - if (record.getAttach() != null) { sql.SET("attach = #{attach,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsTradeOrder.java b/service/src/main/java/com/hfkj/entity/BsTradeOrder.java index 8a0b90d..4a52b3a 100644 --- a/service/src/main/java/com/hfkj/entity/BsTradeOrder.java +++ b/service/src/main/java/com/hfkj/entity/BsTradeOrder.java @@ -253,6 +253,26 @@ public class BsTradeOrder implements Serializable { */ private BigDecimal accDiscountAmount; + /** + * 交易手续费 + */ + private BigDecimal shdFeeAmt; + + /** + * 费率 + */ + private BigDecimal feeRate; + + /** + * 结算金额 + */ + private BigDecimal settleAmount; + + /** + * 结算日期 + */ + private Date settleDate; + /** * 账户端付款码 */ @@ -293,16 +313,6 @@ public class BsTradeOrder implements Serializable { */ private String payNotifyUrl; - /** - * 交易手续费 - */ - private BigDecimal shdFeeAmt; - - /** - * 费率 - */ - private BigDecimal feeRate; - /** * 附加域 */ @@ -722,6 +732,38 @@ public class BsTradeOrder implements Serializable { this.accDiscountAmount = accDiscountAmount; } + public BigDecimal getShdFeeAmt() { + return shdFeeAmt; + } + + public void setShdFeeAmt(BigDecimal shdFeeAmt) { + this.shdFeeAmt = shdFeeAmt; + } + + public BigDecimal getFeeRate() { + return feeRate; + } + + public void setFeeRate(BigDecimal feeRate) { + this.feeRate = feeRate; + } + + public BigDecimal getSettleAmount() { + return settleAmount; + } + + public void setSettleAmount(BigDecimal settleAmount) { + this.settleAmount = settleAmount; + } + + public Date getSettleDate() { + return settleDate; + } + + public void setSettleDate(Date settleDate) { + this.settleDate = settleDate; + } + public String getAccPaymentCode() { return accPaymentCode; } @@ -786,22 +828,6 @@ public class BsTradeOrder implements Serializable { this.payNotifyUrl = payNotifyUrl; } - public BigDecimal getShdFeeAmt() { - return shdFeeAmt; - } - - public void setShdFeeAmt(BigDecimal shdFeeAmt) { - this.shdFeeAmt = shdFeeAmt; - } - - public BigDecimal getFeeRate() { - return feeRate; - } - - public void setFeeRate(BigDecimal feeRate) { - this.feeRate = feeRate; - } - public String getAttach() { return attach; } @@ -941,6 +967,10 @@ public class BsTradeOrder implements Serializable { && (this.getAccTradeNo() == null ? other.getAccTradeNo() == null : this.getAccTradeNo().equals(other.getAccTradeNo())) && (this.getAccMdiscountAmount() == null ? other.getAccMdiscountAmount() == null : this.getAccMdiscountAmount().equals(other.getAccMdiscountAmount())) && (this.getAccDiscountAmount() == null ? other.getAccDiscountAmount() == null : this.getAccDiscountAmount().equals(other.getAccDiscountAmount())) + && (this.getShdFeeAmt() == null ? other.getShdFeeAmt() == null : this.getShdFeeAmt().equals(other.getShdFeeAmt())) + && (this.getFeeRate() == null ? other.getFeeRate() == null : this.getFeeRate().equals(other.getFeeRate())) + && (this.getSettleAmount() == null ? other.getSettleAmount() == null : this.getSettleAmount().equals(other.getSettleAmount())) + && (this.getSettleDate() == null ? other.getSettleDate() == null : this.getSettleDate().equals(other.getSettleDate())) && (this.getAccPaymentCode() == null ? other.getAccPaymentCode() == null : this.getAccPaymentCode().equals(other.getAccPaymentCode())) && (this.getCardType() == null ? other.getCardType() == null : this.getCardType().equals(other.getCardType())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) @@ -949,8 +979,6 @@ public class BsTradeOrder implements Serializable { && (this.getTimeoutExpress() == null ? other.getTimeoutExpress() == null : this.getTimeoutExpress().equals(other.getTimeoutExpress())) && (this.getSubject() == null ? other.getSubject() == null : this.getSubject().equals(other.getSubject())) && (this.getPayNotifyUrl() == null ? other.getPayNotifyUrl() == null : this.getPayNotifyUrl().equals(other.getPayNotifyUrl())) - && (this.getShdFeeAmt() == null ? other.getShdFeeAmt() == null : this.getShdFeeAmt().equals(other.getShdFeeAmt())) - && (this.getFeeRate() == null ? other.getFeeRate() == null : this.getFeeRate().equals(other.getFeeRate())) && (this.getAttach() == null ? other.getAttach() == null : this.getAttach().equals(other.getAttach())) && (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType())) && (this.getRefundPrice() == null ? other.getRefundPrice() == null : this.getRefundPrice().equals(other.getRefundPrice())) @@ -1014,6 +1042,10 @@ public class BsTradeOrder implements Serializable { result = prime * result + ((getAccTradeNo() == null) ? 0 : getAccTradeNo().hashCode()); result = prime * result + ((getAccMdiscountAmount() == null) ? 0 : getAccMdiscountAmount().hashCode()); result = prime * result + ((getAccDiscountAmount() == null) ? 0 : getAccDiscountAmount().hashCode()); + result = prime * result + ((getShdFeeAmt() == null) ? 0 : getShdFeeAmt().hashCode()); + result = prime * result + ((getFeeRate() == null) ? 0 : getFeeRate().hashCode()); + result = prime * result + ((getSettleAmount() == null) ? 0 : getSettleAmount().hashCode()); + result = prime * result + ((getSettleDate() == null) ? 0 : getSettleDate().hashCode()); result = prime * result + ((getAccPaymentCode() == null) ? 0 : getAccPaymentCode().hashCode()); result = prime * result + ((getCardType() == null) ? 0 : getCardType().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); @@ -1022,8 +1054,6 @@ public class BsTradeOrder implements Serializable { result = prime * result + ((getTimeoutExpress() == null) ? 0 : getTimeoutExpress().hashCode()); result = prime * result + ((getSubject() == null) ? 0 : getSubject().hashCode()); result = prime * result + ((getPayNotifyUrl() == null) ? 0 : getPayNotifyUrl().hashCode()); - result = prime * result + ((getShdFeeAmt() == null) ? 0 : getShdFeeAmt().hashCode()); - result = prime * result + ((getFeeRate() == null) ? 0 : getFeeRate().hashCode()); result = prime * result + ((getAttach() == null) ? 0 : getAttach().hashCode()); result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode()); result = prime * result + ((getRefundPrice() == null) ? 0 : getRefundPrice().hashCode()); @@ -1090,6 +1120,10 @@ public class BsTradeOrder implements Serializable { sb.append(", accTradeNo=").append(accTradeNo); sb.append(", accMdiscountAmount=").append(accMdiscountAmount); sb.append(", accDiscountAmount=").append(accDiscountAmount); + sb.append(", shdFeeAmt=").append(shdFeeAmt); + sb.append(", feeRate=").append(feeRate); + sb.append(", settleAmount=").append(settleAmount); + sb.append(", settleDate=").append(settleDate); sb.append(", accPaymentCode=").append(accPaymentCode); sb.append(", cardType=").append(cardType); sb.append(", status=").append(status); @@ -1098,8 +1132,6 @@ public class BsTradeOrder implements Serializable { sb.append(", timeoutExpress=").append(timeoutExpress); sb.append(", subject=").append(subject); sb.append(", payNotifyUrl=").append(payNotifyUrl); - sb.append(", shdFeeAmt=").append(shdFeeAmt); - sb.append(", feeRate=").append(feeRate); sb.append(", attach=").append(attach); sb.append(", refundType=").append(refundType); sb.append(", refundPrice=").append(refundPrice); diff --git a/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java b/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java index 29ac44f..1e044c9 100644 --- a/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java +++ b/service/src/main/java/com/hfkj/entity/BsTradeOrderExample.java @@ -3126,6 +3126,246 @@ public class BsTradeOrderExample { return (Criteria) this; } + public Criteria andShdFeeAmtIsNull() { + addCriterion("shd_fee_amt is null"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtIsNotNull() { + addCriterion("shd_fee_amt is not null"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtEqualTo(BigDecimal value) { + addCriterion("shd_fee_amt =", value, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtNotEqualTo(BigDecimal value) { + addCriterion("shd_fee_amt <>", value, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtGreaterThan(BigDecimal value) { + addCriterion("shd_fee_amt >", value, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("shd_fee_amt >=", value, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtLessThan(BigDecimal value) { + addCriterion("shd_fee_amt <", value, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtLessThanOrEqualTo(BigDecimal value) { + addCriterion("shd_fee_amt <=", value, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtIn(List values) { + addCriterion("shd_fee_amt in", values, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtNotIn(List values) { + addCriterion("shd_fee_amt not in", values, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("shd_fee_amt between", value1, value2, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andShdFeeAmtNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("shd_fee_amt not between", value1, value2, "shdFeeAmt"); + return (Criteria) this; + } + + public Criteria andFeeRateIsNull() { + addCriterion("fee_rate is null"); + return (Criteria) this; + } + + public Criteria andFeeRateIsNotNull() { + addCriterion("fee_rate is not null"); + return (Criteria) this; + } + + public Criteria andFeeRateEqualTo(BigDecimal value) { + addCriterion("fee_rate =", value, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateNotEqualTo(BigDecimal value) { + addCriterion("fee_rate <>", value, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateGreaterThan(BigDecimal value) { + addCriterion("fee_rate >", value, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("fee_rate >=", value, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateLessThan(BigDecimal value) { + addCriterion("fee_rate <", value, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateLessThanOrEqualTo(BigDecimal value) { + addCriterion("fee_rate <=", value, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateIn(List values) { + addCriterion("fee_rate in", values, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateNotIn(List values) { + addCriterion("fee_rate not in", values, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("fee_rate between", value1, value2, "feeRate"); + return (Criteria) this; + } + + public Criteria andFeeRateNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("fee_rate not between", value1, value2, "feeRate"); + return (Criteria) this; + } + + public Criteria andSettleAmountIsNull() { + addCriterion("settle_amount is null"); + return (Criteria) this; + } + + public Criteria andSettleAmountIsNotNull() { + addCriterion("settle_amount is not null"); + return (Criteria) this; + } + + public Criteria andSettleAmountEqualTo(BigDecimal value) { + addCriterion("settle_amount =", value, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountNotEqualTo(BigDecimal value) { + addCriterion("settle_amount <>", value, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountGreaterThan(BigDecimal value) { + addCriterion("settle_amount >", value, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("settle_amount >=", value, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountLessThan(BigDecimal value) { + addCriterion("settle_amount <", value, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("settle_amount <=", value, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountIn(List values) { + addCriterion("settle_amount in", values, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountNotIn(List values) { + addCriterion("settle_amount not in", values, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("settle_amount between", value1, value2, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("settle_amount not between", value1, value2, "settleAmount"); + return (Criteria) this; + } + + public Criteria andSettleDateIsNull() { + addCriterion("settle_date is null"); + return (Criteria) this; + } + + public Criteria andSettleDateIsNotNull() { + addCriterion("settle_date is not null"); + return (Criteria) this; + } + + public Criteria andSettleDateEqualTo(Date value) { + addCriterion("settle_date =", value, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateNotEqualTo(Date value) { + addCriterion("settle_date <>", value, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateGreaterThan(Date value) { + addCriterion("settle_date >", value, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateGreaterThanOrEqualTo(Date value) { + addCriterion("settle_date >=", value, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateLessThan(Date value) { + addCriterion("settle_date <", value, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateLessThanOrEqualTo(Date value) { + addCriterion("settle_date <=", value, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateIn(List values) { + addCriterion("settle_date in", values, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateNotIn(List values) { + addCriterion("settle_date not in", values, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateBetween(Date value1, Date value2) { + addCriterion("settle_date between", value1, value2, "settleDate"); + return (Criteria) this; + } + + public Criteria andSettleDateNotBetween(Date value1, Date value2) { + addCriterion("settle_date not between", value1, value2, "settleDate"); + return (Criteria) this; + } + public Criteria andAccPaymentCodeIsNull() { addCriterion("acc_payment_code is null"); return (Criteria) this; @@ -3646,126 +3886,6 @@ public class BsTradeOrderExample { return (Criteria) this; } - public Criteria andShdFeeAmtIsNull() { - addCriterion("shd_fee_amt is null"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtIsNotNull() { - addCriterion("shd_fee_amt is not null"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtEqualTo(BigDecimal value) { - addCriterion("shd_fee_amt =", value, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtNotEqualTo(BigDecimal value) { - addCriterion("shd_fee_amt <>", value, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtGreaterThan(BigDecimal value) { - addCriterion("shd_fee_amt >", value, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("shd_fee_amt >=", value, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtLessThan(BigDecimal value) { - addCriterion("shd_fee_amt <", value, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtLessThanOrEqualTo(BigDecimal value) { - addCriterion("shd_fee_amt <=", value, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtIn(List values) { - addCriterion("shd_fee_amt in", values, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtNotIn(List values) { - addCriterion("shd_fee_amt not in", values, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("shd_fee_amt between", value1, value2, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andShdFeeAmtNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("shd_fee_amt not between", value1, value2, "shdFeeAmt"); - return (Criteria) this; - } - - public Criteria andFeeRateIsNull() { - addCriterion("fee_rate is null"); - return (Criteria) this; - } - - public Criteria andFeeRateIsNotNull() { - addCriterion("fee_rate is not null"); - return (Criteria) this; - } - - public Criteria andFeeRateEqualTo(BigDecimal value) { - addCriterion("fee_rate =", value, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateNotEqualTo(BigDecimal value) { - addCriterion("fee_rate <>", value, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateGreaterThan(BigDecimal value) { - addCriterion("fee_rate >", value, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("fee_rate >=", value, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateLessThan(BigDecimal value) { - addCriterion("fee_rate <", value, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateLessThanOrEqualTo(BigDecimal value) { - addCriterion("fee_rate <=", value, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateIn(List values) { - addCriterion("fee_rate in", values, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateNotIn(List values) { - addCriterion("fee_rate not in", values, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("fee_rate between", value1, value2, "feeRate"); - return (Criteria) this; - } - - public Criteria andFeeRateNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("fee_rate not between", value1, value2, "feeRate"); - return (Criteria) this; - } - public Criteria andAttachIsNull() { addCriterion("attach is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java index 70a9d4b..da179ab 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java @@ -3,6 +3,8 @@ package com.hfkj.service.impl; import com.alibaba.fastjson.JSONObject; import com.hfkj.channel.hsg.HsgIntegralService; import com.hfkj.channel.hsg.type.RebateProductTypeEnum; +import com.hfkj.channel.lakala.LaKaLaMerService; +import com.hfkj.channel.lakala.LaKaLaTradeService; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; @@ -48,10 +50,8 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { @Resource private BsStoreDiscountActivityPartakeUserService discountActivityPartakeUserService; - @Resource private BsDeviceService deviceService; - @Resource private SoundService soundService; @@ -59,6 +59,8 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { private UserDiscountService userDiscountService; @Resource private BsMerRateService merRateService; + @Resource + private LaKaLaTradeService laKaLaTradeService; @Override public void editOrder(BsTradeOrder tradeOrder) { @@ -389,6 +391,10 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { criteria.andStatusEqualTo(MapUtils.getInteger(param, "status")); } + if (StringUtils.isNotBlank(MapUtils.getString(param, "settleAmountIsNull"))) { + criteria.andSettleAmountIsNull(); + } + example.setOrderByClause("create_time desc"); return tradeOrderMapper.selectByExample(example); }