diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index de4b5bc..f761b38 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -293,13 +293,12 @@ public class Oms2cWaybillController extends BaseController emisMonthpayUseApply.setApplyName("月结卡号绑定申请"); emisMonthpayUseApply.setMsgCode(msgCode); emisMonthpayUseApply.setApplyDate(new Date()); + emisMonthpayUseApply.setAuditStatus(0); emisMonthpayUseApplyService.insertEmisMonthpayUseApply(emisMonthpayUseApply); - //绑定 emisWaybillService.bindMonthPayCode(monthPayCode); - // 插入短信记录 EmisEmailSendRecord emisEmailSendRecord = new EmisEmailSendRecord(); emisEmailSendRecord.setEmail(email); @@ -357,27 +356,20 @@ public class Oms2cWaybillController extends BaseController return AjaxResult.error("月结卡号对应邮箱不存在,不支持绑定!"); } - // 生成流水号 - String nowStr=DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS,new Date()); - String applySeqNo=nowStr+Math.round(Math.random() * 23 + 1000); - - String msgCode = VerifyCodeUtil.generateTextCode(VerifyCodeUtil.TYPE_NUM_ONLY, 4, null); - + // 验证吗验证 EmisMonthpayUseApply emisMonthpayUseApply=new EmisMonthpayUseApply(); emisMonthpayUseApply.setCustomerCode(getLoginUser().getUser().getCustomerCode()); emisMonthpayUseApply.setCustNo(monthPayCode); - emisMonthpayUseApply.setApplySeq(applySeqNo); - emisMonthpayUseApply.setApplyName("月结卡号绑定申请"); - emisMonthpayUseApply.setMsgCode(msgCode); - emisMonthpayUseApply.setApplyDate(new Date()); - emisMonthpayUseApplyService.insertEmisMonthpayUseApply(emisMonthpayUseApply); - - // 发送有限发送短信 -// SpringUtils.getBean(MQSender.class).sendCustomMessage("TANEX-OMS-OPLOG", JSONObject.toJSONString(operLog)); - - emisWaybillService.bindMonthPayCode(monthPayCode); - return AjaxResult.success("你已申请月结账号 "+monthPayCode+" 绑定,联系邮箱"+email+"收取验证码验证。"); + emisMonthpayUseApply.setMsgCode(code); + List listSend=emisMonthpayUseApplyService.selectEmisMonthpayUseApplyList(emisMonthpayUseApply); + if(CollectionUtil.isEmpty(listSend)){ + return AjaxResult.error("验证码错误!"); + } + // 验证成功 + emisMonthpayUseApply.setAuditStatus(1); + emisMonthpayUseApply.setAuditReson("绑定成功"); + return AjaxResult.success("绑定成功"); }catch (Exception ex){ ex.printStackTrace();