diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java index 8cc946e..5b24c5e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java @@ -166,8 +166,4 @@ public interface SysUserMapper { public SysUser selectCustInfoByPhoneNumber(@Param("phoneNumber") String phoneNumber); public CustCasual selectCustCasualByCustId(@Param("custId") Long custId, @Param("sourceType") Integer sourceType, @Param("ifDel") Integer ifDel); - - int addCustCasual(CustCasual custCasual); - - int updateCustCasual(CustCasual custCasual); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java index 2133ea8..c301a20 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java @@ -660,28 +660,28 @@ public class SysUserServiceImpl implements ISysUserService { @Override public SysUser addOrUpdateCustCasual(Integer sourceType, SysUser result) { - Long custId = result.getCustId(); - CustCasual custCasual = userMapper.selectCustCasualByCustId(custId, sourceType, 2); // 1-删除,2-正常 - String openid; - if (Objects.isNull(custCasual)) { - CustCasual insertCasual = new CustCasual(); - openid = IdUtil.simpleUUID(); - //insertCasual.setCasualId(Id.next()); //TODO, NPE - insertCasual.setCasualName(Sm4Utils.custDecrypt(result.getCustName())); - insertCasual.setCustId(result.getCustId()); - insertCasual.setMobile(Sm4Utils.custDecrypt(result.getPhonenumber())); - insertCasual.setOpenid(openid); - insertCasual.setSourceType(sourceType); - userMapper.addCustCasual(insertCasual); - } else { - openid = custCasual.getOpenid(); - if (StringUtils.isBlank(openid)) { - openid = IdUtil.simpleUUID(); - userMapper.updateCustCasual(custCasual); - } - } - - result.setOpenid(openid); +// Long custId = result.getCustId(); +// CustCasual custCasual = userMapper.selectCustCasualByCustId(custId, sourceType, 2); // 1-删除,2-正常 +// String openid; +// if (Objects.isNull(custCasual)) { +// CustCasual insertCasual = new CustCasual(); +// openid = IdUtil.simpleUUID(); +// insertCasual.setCasualId(Id.next()); //TODO, NPE +// insertCasual.setCasualName(Sm4Utils.custDecrypt(result.getCustName())); +// insertCasual.setCustId(result.getCustId()); +// insertCasual.setMobile(Sm4Utils.custDecrypt(result.getPhonenumber())); +// insertCasual.setOpenid(openid); +// insertCasual.setSourceType(sourceType); +// userMapper.addCustCasual(insertCasual); +// } else { +// openid = custCasual.getOpenid(); +// if (StringUtils.isBlank(openid)) { +// openid = IdUtil.simpleUUID(); +// userMapper.updateCustCasual(custCasual); +// } +// } +// +// result.setOpenid(openid); //result.setCustName(SM4EncryptUtils.sm4Decrypt(result.getCustName())); //result.setPhonenumber(SM4EncryptUtils.sm4Decrypt(result.getPhonenumber())); return result; diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 23c4c35..60764e6 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -382,19 +382,4 @@ - - - - insert into cust_casual (casual_id, casual_name, cust_id, mobile, openid, source_type) - values (#{casualId}, #{casualName}, #{custId}, #{mobile}, #{openid}, #{sourceType}) - - - - update cust_casual - set openid = #{openId} - where casual_id = #{casualId} - -