lyhzzz 2 년 전
부모
커밋
5e0198b997

+ 6 - 2
src/main/java/com/fdkankan/manage/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.util.BeanMapUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -110,8 +112,10 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
                 throw new BusinessException(ResultCode.OLD_PASSWORD_ERROR);
             }
         }
-        if(sysUser.getId() != null){
-            rabbitMqProducer.sendByWorkQueue(MqQueueUtil.manageToSaleQueue,JSONObject.toJSONString(new ManageToSaleParam(MqQueueUtil.updateUserCommand,sysUser)));
+        if(sysUser.getId() != null && !StringUtils.isEmpty(sysUser.getNickName())){
+            ManageToSaleParam saleParam = new ManageToSaleParam(MqQueueUtil.updateUserCommand, sysUser);
+            Map<String, Object> map = BeanUtil.beanToMap(saleParam);
+            rabbitMqProducer.sendByWorkQueue(MqQueueUtil.manageToSaleQueue,map);
         }
         this.saveOrUpdate(sysUser);
     }

+ 3 - 0
src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -24,6 +24,9 @@ public class IncrementOrderVo {
     @ExcelProperty("用户账号")
     private String userName;                //用户账号
 
+    @ExcelProperty("客户名称")
+    private String nickName;                //昵称
+
     @ExcelProperty("订单金额")
     private BigDecimal amount;              //订单金额
 

+ 1 - 1
src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.fdkankan.manage.mapper.IIncrementOrderMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
-        select o.* ,u.user_name from  t_increment_order o
+        select o.* ,u.user_name,u.nick_name from  t_increment_order o
         left join t_user u on o.user_id = u.id
         WHERE o.rec_status = 'A' and o.pay_status = '1'
         <if test="param.orderSn !=null and param.orderSn !='' ">