用户 续方

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -81,7 +81,8 @@ public class MedOrderService {
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(params.getString("pick_up_num"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            mediicineorder.setSocialSecurityCardNum(params.getString("securityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("SocialinsurPayment"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -118,7 +118,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     */
    public UserDO registerWithMobile(UserDO userDO) {
        userDO.setSalt(randomString(5));
        userDO.setEnabled(1);
        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
            userDO.setEnabled(1);
        }else {
            userDO.setEnabled(userDO.getEnabled());
        }
        userDO.setLocked(0);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
@@ -464,7 +468,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            userDO = EntityUtils.jsonToEntity(user.toString(),UserDO.class);
            UserDO oldUser = userDao.findOne(userDO.getId());
            userDO.setPassword(oldUser.getPassword());
            userDO.setSalt(randomInt(5));
            userDO.setSalt(oldUser.getSalt());
            userDO.setUpdateTime(new Date());
        } catch (Exception e) {
            result.put("msg", "convert user jsonObject to UserDO failed," + e.getCause());