This commit is contained in:
linfso 2024-09-01 08:27:20 +08:00
parent 0e71fcf497
commit 862a225e42

View File

@ -392,21 +392,31 @@ public class Oms2cWaybillController extends BaseController
return AjaxResult.error("绑定失败,月结卡号必填!"); return AjaxResult.error("绑定失败,月结卡号必填!");
} }
// 查询月结账号是否存在 // 查询月结账号是否存在
SysOmsUser qParam = new SysOmsUser(); SysOmsUser sysOmsUser0=null;
qParam.setMonthlyPayCode(monthPayCode);
SysOmsUser qParam = new SysOmsUser();
qParam.setCustomerType("2");
qParam.setMonthlyPayCode(monthPayCode);
List<SysOmsUser> omsUserList = sysOmsUserService.selectSysOmsUserList(qParam); List<SysOmsUser> omsUserList = sysOmsUserService.selectSysOmsUserList(qParam);
if(CollectionUtil.isEmpty(omsUserList)){ if(CollectionUtil.isEmpty(omsUserList)){
//根据公司名称查询
SysOmsUser qParam2 = new SysOmsUser();
qParam2.setCustomerName(monthPayCode);
qParam2.setCustomerType("2");
List<SysOmsUser> omsUserListCompany = sysOmsUserService.selectSysOmsUserList(qParam2);
if(CollectionUtil.isEmpty(omsUserListCompany)){
return AjaxResult.error("绑定失败,月结卡号不存在!"); return AjaxResult.error("绑定失败,月结卡号不存在!");
} }
SysOmsUser sysOmsUser0 = omsUserList.get(0); sysOmsUser0 = omsUserListCompany.get(0);
String email = sysOmsUser0.getEmail(); }else{
if(StringUtils.isEmpty(email)){ sysOmsUser0 = omsUserList.get(0);
// return AjaxResult.error("月结卡号对应邮箱不存在,不支持绑定!");
} }
monthPayCode = sysOmsUser0.getMonthlyPayCode();
// 已绑定无需再绑定 // 已绑定无需再绑定
EmisMonthpayUseApply applayQuery=new EmisMonthpayUseApply(); EmisMonthpayUseApply applayQuery=new EmisMonthpayUseApply();
applayQuery.setCustomerCode(getLoginUser().getUser().getCustomerCode()); applayQuery.setCustomerCode(getLoginUser().getUser().getCustomerCode());
@ -422,10 +432,7 @@ public class Oms2cWaybillController extends BaseController
// 生成流水号 // 生成流水号
// String nowStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date());
// String applySeqNo = nowStr + Math.round(Math.random() * 23 + 1000);
String applySeqNo = DBUtil.getSeqNoByLen(8); String applySeqNo = DBUtil.getSeqNoByLen(8);
String msgCode = VerifyCodeUtil.generateTextCode(VerifyCodeUtil.TYPE_NUM_ONLY, 4, null); String msgCode = VerifyCodeUtil.generateTextCode(VerifyCodeUtil.TYPE_NUM_ONLY, 4, null);
EmisMonthpayUseApply emisMonthpayUseApply = new EmisMonthpayUseApply(); EmisMonthpayUseApply emisMonthpayUseApply = new EmisMonthpayUseApply();
@ -438,20 +445,7 @@ public class Oms2cWaybillController extends BaseController
emisMonthpayUseApply.setAuditStatus(0); emisMonthpayUseApply.setAuditStatus(0);
emisMonthpayUseApplyService.insertEmisMonthpayUseApply(emisMonthpayUseApply); emisMonthpayUseApplyService.insertEmisMonthpayUseApply(emisMonthpayUseApply);
//绑定 return AjaxResult.success("已申请月结账号 "+monthPayCode+" 绑定,输入密码完成绑定。");
// emisWaybillService.bindMonthPayCode(monthPayCode);
// 插入短信记录
// EmisEmailSendRecord emisEmailSendRecord = new EmisEmailSendRecord();
// emisEmailSendRecord.setEmail(email);
//// String sendMsg=getLoginUser().getUser().getCustomerName()+" 申请绑定月结账号:"+monthPayCode+",验证码是"+msgCode;
// String sendMsg=getLoginUser().getUser().getCustomerName()+" 申请绑定月结账号:"+monthPayCode+",输入月结密码完成绑定。";
// emisEmailSendRecord.setContent(sendMsg);
// emisEmailSendRecordService.insertEmisEmailSendRecord(emisEmailSendRecord);
// return AjaxResult.success("你已申请月结账号 "+monthPayCode+" 绑定,联系邮箱"+email+"收取验证码验证。");
return AjaxResult.success("你已申请月结账号 "+monthPayCode+" 绑定,输入月结密码完成绑定。");
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();