Merge branch 'gaohu-smile-0915-three' of...

Merge branch 'gaohu-smile-0915-three' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into gaohu-smile-0915-three

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -87,7 +87,7 @@ public class SmileUserController extends BaseController {
     @ResponseBody
     @ApiOperationSupport(order = 1)
     public AjaxResult updateUserStateById(@RequestBody SaveUserStateParam saveUserStateParam) {
-        return iSmileUserService.updateUserStateById(saveUserStateParam.getUid(), saveUserStateParam.getState());
+        return iSmileUserService.updateUserStateById(saveUserStateParam.getUid(), saveUserStateParam.getState(),saveUserStateParam.getReason());
     }
 
     @PostMapping("/listByState")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SaveUserStateParam.java

@@ -17,4 +17,7 @@ public class SaveUserStateParam {
     @ApiModelProperty(value = "标识【0：正常；1：黑名单】", example = "1")
     @NotNull(message = "标识不能为空")
     private Integer state;
+
+    @ApiModelProperty(value = "拉黑原因")
+    private String reason;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java

@@ -18,7 +18,7 @@ public interface ISmileUserService extends IService<SmileUser> {
 
     List<SmileUserVoOrg> getUserListByOrgId(Long orgId, Long agentId);
 
-    AjaxResult updateUserStateById(String uid, Integer state);
+    AjaxResult updateUserStateById(String uid, Integer state,String reason);
 
     PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -127,11 +127,11 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     }
 
     @Override
-    public AjaxResult updateUserStateById(String uid, Integer state) {
+    public AjaxResult updateUserStateById(String uid, Integer state, String reason) {
         SmileUserVO smileUserVO = getSmileUserVO(uid);
         //修改黑名单
-        smileUserMapper.updateUserStateById(uid, state);
-        updateRedisSetUser(smileUserVO, uid, state);
+        smileUserMapper.updateUserStateById(uid, state, reason);
+        updateRedisSetUser(smileUserVO, uid, state, reason);
         return AjaxResult.success();
     }
 
@@ -326,15 +326,12 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     }
 
     //跟新redis中的用户  0：正常，1：黑名单
-    private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, Integer state) {
+    private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, Integer state, String reason) {
         SmileUserVO userVO = smileRedisUtils.getSmileUserVO(uid);
         if (StringUtils.isNotNull(userVO)) {
             userVO.setState(state);
-        } else {
-            //状态  0：正常，1：黑名单
-            if (StringUtils.isNotNull(state)) {
-                smileUserVO.setState(state);
-            }
+            userVO.setUpdatedDate(LocalDateTime.now());
+            userVO.setErrorReason(reason != null && !reason.equals("") ? reason : userVO.getErrorReason());
         }
         //存入黑白名单状态
         smileRedisUtils.setSmileUserVO(uid, userVO);

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserMapper.java

@@ -34,7 +34,7 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
 
     void updateUserByUid(@Param("uid") String uid,@Param("orgId") Long orgId,@Param("type")Integer tag,@Param("agentId") String agentId);
 
-    void updateUserStateById(@Param("uid") String uid,@Param("state") Integer state);
+    void updateUserStateById(@Param("uid") String uid,@Param("state") Integer state,@Param("reason") String reason);
 
     void updateUserCheckByUid(@Param("uid") String uid,@Param("type") Integer type,@Param("reason") String reason);
     int getCount();

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -135,6 +135,9 @@
     <update id="updateUserStateById">
         update smile_user
         set `state`     = #{state},
+            <if test="reason!=null and reason != ''">
+                error_reason = #{reason},
+            </if>
             updated_date=NOW()
         where `uid` = #{uid}
     </update>