diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java index ce57ecac82..c23eb61127 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java @@ -105,6 +105,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper list); - @Select("select sid from bus_sales_order_loancontract where customSid = #{customSid}") + @Select("select sid from bus_sales_order_borrower where customSid = #{customSid}") String selectByCustomSid(String customSid); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 27ed87cdeb..f53f689a17 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -276,4 +276,7 @@ public interface SysUserFeign { @PostMapping(value = "/removeRedis") ResultBean removeRedis(); + @ApiOperation("获取小程序客户用户信息") + @GetMapping("/fetchBySidWx/{sid}") + public ResultBean fetchBySidWx(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index 563f9f6ac6..7b1a034c89 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -260,4 +260,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean removeRedis() { return null; } + + @Override + public ResultBean fetchBySidWx(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java index fef8f55d92..f4238fc25b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java @@ -31,6 +31,11 @@ public interface AppSysUserFeign { @ApiOperation(value = "1、app用户登录") public ResultBean login(@RequestBody SysUserQuery sysUserQuery); + @PostMapping("/loginWx") + @ResponseBody + @ApiOperation(value = "小程序客户登录") + public ResultBean loginWx(@RequestBody SysUserQuery sysUserQuery); + @ApiOperation(value = "手机发送验证码(登录、修改密码、找回密码)") @ResponseBody @PostMapping("/sendVerificationCodeForApp") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java index 0405c60d83..6d1a294b75 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java @@ -21,6 +21,11 @@ public class AppSysUserFeignFallback implements AppSysUserFeign { return new ResultBean().fail().setMsg("网站维护，请稍后再试"); } + @Override + public ResultBean loginWx(SysUserQuery sysUserQuery) { + return null; + } + @Override public ResultBean sendVerificationCodeForApp(String mobile, String type, String appId) { return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index 7541ab547d..9f642e8570 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -200,4 +200,8 @@ public interface SysUserMapper extends BaseMapper { List selectUserByStaffSid(@Param("list") List staffList); List selectTokenList(); + + SysUser selectByUserNameWx(String userName); + + SysUser selectByMobileWx(String userName); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index aa6f200046..a21946576c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -416,4 +416,20 @@ left join sys_user su on su.staffSid = si.sid where si.personTypeKey = '01' and length(su.token)>0 + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 9578729694..d98d1177f9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -703,4 +703,9 @@ public class SysUserRest implements SysUserFeign { public ResultBean removeRedis() { return sysUserService.removeRedis(); } + + @Override + public ResultBean fetchBySidWx(String sid) { + return sysUserService.fetchBySidWx(sid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index c8f60096de..df0b19bf88 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1533,4 +1533,51 @@ public class SysUserService extends MybatisBaseService { } return rb.success(); } + + public SysUser selectByUserNameWx(String userName) { + return baseMapper.selectByUserNameWx(userName); + } + + public SysUser selectByMobileWx(String userName) { + return baseMapper.selectByMobileWx(userName); + } + + /** + * 小程序登录后设置token + * + * @param user + * @return + */ + public SysUserVo selectUserWx(SysUser user) { + String oldToken = user.getToken(); + if (StringUtils.isNotBlank(oldToken)) { + redisUtil.remove(oldToken); + } + String uniqueToken = JWTUtil.create(user.getSid() + ""); + String newToken = "Wx" + uniqueToken; + redisUtil.set(newToken, user.getUserName(), USERS_REDIS_SESSION_TL_App); + SysUserVo sysUserVo = new SysUserVo(); + BeanUtil.copyProperties(user, sysUserVo); + sysUserVo.setToken(newToken); + // 更新用户中的token + updateToken(user.getSid(), newToken); + //查询是否需要更换密码 + boolean isTrue = false; + String mobile = user.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + if (user.getPassword().equals(md5)) { + isTrue = true; + } + } + sysUserVo.setNeedResetPsd(isTrue); + return sysUserVo; + } + + public ResultBean fetchBySidWx(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysUser sysUser = fetchBySid(sid); + return rb.success().setData(sysUser); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java index 260aa368f1..c8fef57ad0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java @@ -89,7 +89,7 @@ public class AppSysUserRest implements AppSysUserFeign { // 访问后清理key } boolean isTest = false; - if(userQuery.getIsTest() != null){ + if (userQuery.getIsTest() != null) { isTest = userQuery.getIsTest(); } isTest = true; @@ -217,6 +217,71 @@ public class AppSysUserRest implements AppSysUserFeign { } } + @Override + public ResultBean loginWx(SysUserQuery userQuery) { + /* + 1、根据传参设备appId查询绑定账号 + 1、1未查询到绑定的账号： + 1、1、1、查询用户登录账号（不存在-->返回“账号不存在”）； + 1、1、2、账号存在，获取当前账号绑定的设备值： + 1）设备值为空，验证登录成功后即绑定设备，返回用户信息，验证不成功返回错误信息（验证码、密码错误） + 2）设备值存在，向表sys_exception_log插入数据，返回：当前账号已被其它设备绑定（错误码101（说明：错误码为sys_exception_log的id）） + 1、2查询到绑定的账号 + 1、2、1、根据传参设备appId查询到绑定的账号与用户传递的账号不一致 + 1）向表sys_exception_log插入数据，返回：当前设备已绑定其它账号（错误码102） + 1、2、2、根据传参设备appId查询到绑定的账号与用户传递的账号一致，验证登录信息 + 1）验证登录信息，成功后返回用户信息，验证不成功返回错误信息（验证码、密码错误） + */ + ResultBean rb = ResultBean.fireFail(); + String userName = userQuery.getUserName(); + String password = userQuery.getPassword(); + String verifyCode = userQuery.getVerifyCode(); + String type = userQuery.getType(); // type:1、密码登录2、验证码登录 + + if (StringUtils.isBlank(userName)) return new ResultBean().fail().setMsg("用户名不能为空"); + if (type.equals("1")) { + if (StringUtils.isBlank(password)) return new ResultBean().fail().setMsg("密码不能为空"); + } else { + if (StringUtils.isBlank(verifyCode)) return new ResultBean().fail().setMsg("验证码不能为空"); + // 访问后清理key + } + SysUser sysUser = sysUserService.selectByUserNameWx(userName); + if (sysUser == null) { + sysUser = sysUserService.selectByMobileWx(userName); + if (sysUser == null) { + return rb.setMsg("用户名或密码错误"); + } + } + if (type.equals("1")) { + String md5 = Encodes.md5(password); + if (md5.equals(sysUser.getPassword())) { + SysUserVo sysUserVo = sysUserService.selectUserWx(sysUser); + if (sysUserVo == null) { + return rb.setMsg("用户名或密码错误"); + } + insertLoginLogWx(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } else { + String codeFromRedis = redisUtil.get("loginCode" + userName); + if (StringUtils.isBlank(codeFromRedis)) + return new ResultBean().fail().setMsg("短信验证码已失效，请重新发送"); + if (verifyCode.equals(codeFromRedis.substring(0, 4))) { + SysUserVo sysUserVo = sysUserService.selectUserWx(sysUser); + if (sysUserVo == null) { + return rb.setMsg("用户名或密码错误"); + } + redisUtil.remove("loginCode" + userName); + insertLoginLogWx(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("短信验证码错误或已失效，请重新获取"); + } + } + } + /** * 插入登录日志 * @@ -233,6 +298,17 @@ public class AppSysUserRest implements AppSysUserFeign { systemLogService.save(systemLog); } + private void insertLoginLogWx(SysUser user) { + SystemLog systemLog = new SystemLog(); + systemLog.setUserName(user.getUserName()); + String ip = WebUtil.getIpAddr(httpServletRequest); + systemLog.setUserIp(ip); + systemLog.setEventUrl("portal/v1/appuser/loginWx"); + systemLog.setEventContent("客户登录"); + systemLog.setEventName("客户登录"); + systemLogService.save(systemLog); + } + /** * 手机发送短信验证码 * @@ -360,14 +436,14 @@ public class AppSysUserRest implements AppSysUserFeign { } String isAdmin = ""; SysUser sysUser = sysUserService.fetchBySid(userSid); - if(sysUser != null){ + if (sysUser != null) { isAdmin = sysUser.getIsAdmin(); } - if("1".equals(isAdmin)){ + if ("1".equals(isAdmin)) { String roleName = sysRoleService.selectByUserSid(userSid); userInfo.setPosition(roleName); - }else{ + } else { //根据用户sid查询岗位 List stringList = sysUserService.getPost(sysUserVo.getStaffSid()); stringList.removeAll(Collections.singleton(null)); @@ -455,7 +531,7 @@ public class AppSysUserRest implements AppSysUserFeign { @Override public ResultBean selectAppHaveMessage(String menuSid, String orgPath) { - return sysUserService.selectAppHaveMessage(menuSid,orgPath); + return sysUserService.selectAppHaveMessage(menuSid, orgPath); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java index b14736ef13..f591352b63 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java @@ -8,6 +8,8 @@ import com.auth0.jwt.interfaces.DecodedJWT; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomer.wx.WxCrmCustomerQuery; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.api.sysuser.wx.*; @@ -64,6 +66,8 @@ public class WxSysUserRest implements WxSysUserFeign { @Autowired private CrmCustomerFeign crmCustomerFeign; @Autowired + private CrmCustomerTempFeign crmCustomerTempFeign; + @Autowired private SysOrganizationService sysOrganizationService; @Autowired private HttpServletRequest request; @@ -304,10 +308,11 @@ public class WxSysUserRest implements WxSysUserFeign { } boolean isHave = false; WxHomePageVo wxHomePageVo = sysUserService.selectHomePage(userSid); - ResultBean resultBean = crmCustomerFeign.selectBySid(wxHomePageVo.getStaffSid()); - if (resultBean.getSuccess()) { - wxHomePageVo.setIdTerm(resultBean.getData().getEndDate()); + if (wxHomePageVo == null){ + wxHomePageVo = new WxHomePageVo(); } + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData(); + wxHomePageVo.setIdTerm(crmCustomerTempVo.getEndDate()); if (StringUtils.isBlank(wxHomePageVo.getHeadImage())) { //默认头像 wxHomePageVo.setHeadImage("http://120.46.131.15:8111/upload/appImage/headImage.jpg"); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java index 3471763d0a..292ee2aa29 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java @@ -13,11 +13,11 @@ import lombok.Data; public class AppRepaymentPlanRecord implements Vo { @ApiModelProperty("月份期数") - private String date; + private String monthStr; @ApiModelProperty("合计") - private String total; + private String totalStr; @ApiModelProperty("月还") - private String yh; + private String monthlyPaymentStr; @ApiModelProperty("其他融") - private String qtr; + private String otherMonthlyPaymentStr; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index 623be62dfa..779903550d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -126,7 +126,7 @@ public interface LoanRepaymentScheduleFeign { @ApiOperation("微信小程序还款计划列表") @PostMapping("/getRepaymentPlanListWx") @ResponseBody - ResultBean> getRepaymentPlanListWx(PagerQuery pagerQuery); + ResultBean> getRepaymentPlanListWx(@RequestBody PagerQuery pagerQuery); @ApiOperation("微信小程序查看单车还款计划表") @GetMapping("/getRepaymentPlanListByVinNoWx") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index e7f05de1e2..ac7edbb2ed 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -860,7 +860,7 @@ '(', period, ')' - ) AS 'date', + ) AS monthStr, (SELECT dueMoney FROM @@ -868,7 +868,7 @@ WHERE vinNo = #{vinNo} AND scheduleSid = #{scheduleSid} AND policyOrOther = '0' - AND a.period = c.period) AS yh, + AND a.period = c.period) AS monthlyPaymentStr, (SELECT dueMoney FROM @@ -876,7 +876,7 @@ WHERE vinNo = #{vinNo} AND scheduleSid = #{scheduleSid} AND policyOrOther = '1' - AND b.period = c.period) AS qtr, + AND b.period = c.period) AS otherMonthlyPaymentStr, (SELECT dueMoney FROM @@ -894,7 +894,7 @@ AND policyOrOther = '1' AND b.period = c.period), 0 - ) AS total + ) AS totalStr FROM loan_repayment_plan_details c WHERE vinNo = #{vinNo} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 3d04d484d4..53bce3fe9b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -30,6 +30,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; @@ -6951,8 +6952,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService repaymentPlanVehWxVoList; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java index 53849cedc0..1c512dbdaa 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java @@ -76,21 +76,28 @@ public class RepaymentPlanService { ResultBean> repaymentPlanList = loanRepaymentScheduleFeign.getRepaymentPlanListWx(pagerQuery); if (repaymentPlanList.getSuccess()) { PagerVo data = repaymentPlanList.getData(); - BeanUtil.copyProperties(data, pagerVo); List vehWxVos = new ArrayList<>(); - for (AppRepaymentPlanVo record : data.getRecords()) { - String vinNo = record.getVinNo(); + List records1 = data.getRecords(); + List records2 = new ArrayList<>(); + for (AppRepaymentPlanVo appRepaymentPlanVo : records1) { + RepaymentPlanWxVo repaymentPlanWxVo = new RepaymentPlanWxVo(); + repaymentPlanWxVo.setSid(appRepaymentPlanVo.getSid()); + repaymentPlanWxVo.setContractId(appRepaymentPlanVo.getContractId()); + repaymentPlanWxVo.setFinancial(appRepaymentPlanVo.getFinancial()); + repaymentPlanWxVo.setLenderName(appRepaymentPlanVo.getLenderName()); + repaymentPlanWxVo.setSalesName(appRepaymentPlanVo.getSalesName()); + repaymentPlanWxVo.setManagementName(appRepaymentPlanVo.getManagementName()); + String vinNo = appRepaymentPlanVo.getVinNo(); String[] vinNos = vinNo.split(","); for (String no : vinNos) { RepaymentPlanVehWxVo repaymentPlanVehWxVo = new RepaymentPlanVehWxVo(); repaymentPlanVehWxVo.setVinNo(no); vehWxVos.add(repaymentPlanVehWxVo); } + repaymentPlanWxVo.setRepaymentPlanVehWxVoList(vehWxVos); + records2.add(repaymentPlanWxVo); } - List records = pagerVo.getRecords(); - for (RepaymentPlanWxVo record : records) { - record.setRepaymentPlanVehWxVoList(vehWxVos); - } + pagerVo.setRecords(records2); } return rb.success().setData(pagerVo); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java index 3c0df2131b..45ef56e89c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java @@ -1,8 +1,8 @@ package com.yxt.wms.biz.inventory.wmsinventoryallocatebill; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -15,11 +15,13 @@ import java.util.Date; public class WmsInventoryAllocateBill extends BaseEntity { private String billNo;//单据编号 - private String createDate;//制单日期 - private String createUserSid;//制单人sid private String createByName;//制单人姓名 - private String outOrgSid;//调出分公司sid - private String outOrgName;//调出分公司 + private String deptSid;//申请部门sid + private String deptName;//申请部门名称 + private String outPlatSid;//调出站sid + private String outPlatName;//调出站名称 + private String inPlatSid;//调入站sid + private String inPlatName;//调入站名称 private String inOrgSid;//调入分公司sid private String inOrgName;//调入分公司 private String count;//调拨数量 @@ -28,7 +30,16 @@ public class WmsInventoryAllocateBill extends BaseEntity { private String confirmName;//确认人姓名 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date finishTime;//完成时间 - private String useOrgSid;//使用组织sid + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id private String createOrgSid;//创建组织sid private String createOrgName;//创建组织名称 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDto.java deleted file mode 100644 index 40caa49fcf..0000000000 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDto.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.yxt.wms.biz.inventory.wmsinventoryallocatebill; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class WmsInventoryAllocateBillDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String goodsID;//商品ID（唯一编码，入库时生成） - private String goodsSid;//商品sid - private String billSid;//入库单sid - private String billDetailSid;//入库单明细sid - private String price1;//销售价格1 - private String price2;//销售价格2 - private String price3;//销售价格3 - private String price4;//销售价格4 - private String price5;//销售价格5 - private String unit;//计量单位 - private String count;//库存数量 - private String minimumPrice;//销售底价 - private String freePrice;//三包价格 - private String firstMaintainPrice;//首保价格 - private String warehouseSid;//仓库sid - private String warehouseName;//仓库名称 - private String warehouseArea;//货位 - private String isShowDiscount;//是否显示折扣标志 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date firstInDate;//首次入库日期-计算库龄的依据 - private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库 - private String sortNo;//排序 - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java index 0deaaf1152..3e4b81ba2c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java @@ -14,8 +14,6 @@ import org.apache.ibatis.annotations.Update; */ @Mapper public interface WmsInventoryAllocateBillMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - WmsInventoryAllocateBillVo initialization (@Param("sid") String sid); IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml index d6082525cf..54e7b2d89f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml @@ -3,24 +3,6 @@ - - - - - select - a.*,b.goodsName as goodsName - from wms_inventory_allocate_bill_detail a - left join wms_goods b on b.sid =a.goodsSid - - ${ew.sqlSegment} - - - -