Merge branch 'Jw' into 'master'

Jw See merge request hewei/Jumeirah!60

Merge branch 'Jw' into 'master'
Jw See merge request hewei/Jumeirah!60
c41cfb42 · JJww · ffb6800e · 9a14d02e · c41cfb42 · c41cfb42
Commit c41cfb42 authored Oct 30, 2020 by JJww
15 changed files
--- a/api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java
@@ -18,6 +18,7 @@ import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +28,9 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Set;
 /**
 * APP用户 控制器
 *
@@ -153,5 +157,11 @@ public class AppUserController extends BaseController {
        return appUserApiService.getUserInfo(Long.valueOf(JwtUtil.getUsername(JwtTokenUtil.getToken())));
    }
+    @GetMapping("/userInfoList")
+    @ApiOperation(value = "批量获取用户信息")
+    public ApiResult<List<AppUser>> getUserInfoList(@RequestParam("uids") Set<Long> uids) {
+        return appUserApiService.getAppUserList(uids);
+    }
 }
--- a/api-app/src/main/java/com/jumeirah/api/app/service/AppUserApiService.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/service/AppUserApiService.java
@@ -6,6 +6,9 @@ import com.jumeirah.common.param.app.AppUserInfoParam;
 import com.jumeirah.common.vo.app.LoginAppUserTokenVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import java.util.List;
+import java.util.Set;
 public interface AppUserApiService {
    /**
@@ -39,5 +42,13 @@ public interface AppUserApiService {
     */
    AppUser getUserInfo(Long userId);
+    /**
+     * 批量获取用户信息
+     *
+     * @param uids
+     * @return
+     */
+    ApiResult<List<AppUser>> getAppUserList(Set<Long> uids);
 }
--- a/api-app/src/main/java/com/jumeirah/api/app/service/impl/AppUserApiServiceImpl.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/service/impl/AppUserApiServiceImpl.java
@@ -18,6 +18,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Set;
 @Service
 public class AppUserApiServiceImpl implements AppUserApiService {
@@ -59,6 +62,11 @@ public class AppUserApiServiceImpl implements AppUserApiService {
    }
    @Override
+    public ApiResult<List<AppUser>> getAppUserList(Set<Long> uids) {
+        return ApiResult.ok(appUserService.list(new QueryWrapper<AppUser>().lambda().in(AppUser::getId, uids)));
+    }
+    @Override
    public ApiResult<LoginAppUserTokenVo> register(AppSmsRegisterParam loginParam, String language) throws Exception {
        // 校验验证码
        boolean equalsRegisterCode = appSmsService.equalsRegisterCode(loginParam.getPhoneArea(), loginParam.getPhone(), loginParam.getSmsCode());

--- a/api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserController.java
+++ b/api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserController.java
 package com.jumeirah.api.merchant.controller;
+import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
+import com.jumeirah.common.param.MerchantUserInfoParam;
 import com.jumeirah.common.service.MerchantService;
 import com.jumeirah.common.service.MerchantUserService;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
@@ -14,12 +16,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 /**
 * 商家用户 控制器
@@ -109,6 +109,13 @@ public class MerchantUserController extends BaseController {
        return merchantUserService.updatePwd(merchantUpdatePwdParam);
    }
+    @GetMapping("/info")
+    @OperationLogIgnore
+    @ApiOperation(value = "批量获取商户用户信息")
+    public ApiResult<List<MerchantUser>> merchantUserListByMcIdAndIds(@Validated @ModelAttribute MerchantUserInfoParam merchantUpdatePwdParam) {
+        return merchantUserService.getMerchantUserListByMcIdAndIds(merchantUpdatePwdParam);
+    }
 //    @PostMapping("/register")
 //    @OperationLogIgnore
 //    @ApiOperation(value = "注册", notes = "商家注册")

--- a/common/pom.xml
+++ b/common/pom.xml
@@ -29,6 +29,11 @@
        </dependency>
        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
            <version>4.3.5</version>

--- a/common/src/main/java/com/jumeirah/common/entity/MerchantUser.java
+++ b/common/src/main/java/com/jumeirah/common/entity/MerchantUser.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.swagger.annotations.ApiModel;
@@ -47,6 +48,7 @@ public class MerchantUser extends BaseEntity {
    @ApiModelProperty("昵称")
    private String nickname;
+    @JsonIgnore
    @NotBlank(message = "密码不能为空")
    @ApiModelProperty("密码")
    private String password;

--- a/common/src/main/java/com/jumeirah/common/mq/Queue.java
+++ b/common/src/main/java/com/jumeirah/common/mq/Queue.java
+package com.jumeirah.common.mq;
+import com.jumeirah.common.entity.Stroke;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+/**
+ * @author: JJww
+ * @Date:2019-07-19
+ */
+@Component
+public class Queue {
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+    @Value("${spring.rabbitmq.user-queue-name}")
+    private String userQueueName;
+    @Value("${spring.rabbitmq.order-queue-name}")
+    private String orderQueueName;
+    /**
+     * 推送订单状态到客服系统
+     *
+     * @param orderInteractionModel
+     */
+    public void pushOrder(Stroke stroke) {
+        rabbitTemplate.convertAndSend(orderQueueName, stroke);
+    }
+    /**
+     * 禁用用户
+     *
+     * @param userId
+     */
+    public void disableUserQueue(String userId) {
+        rabbitTemplate.convertAndSend(userQueueName, userId);
+    }
+}
\ No newline at end of file
--- a/common/src/main/java/com/jumeirah/common/param/MerchantUserInfoParam.java
+++ b/common/src/main/java/com/jumeirah/common/param/MerchantUserInfoParam.java
+package com.jumeirah.common.param;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Set;
+/**
+ * @author: JJww
+ * @Date:2020/10/30
+ */
+@Data
+public class MerchantUserInfoParam implements Serializable {
+    private Long mcId;
+    private Set<Long> mcUserIds;
+}
--- a/common/src/main/java/com/jumeirah/common/service/MerchantUserService.java
+++ b/common/src/main/java/com/jumeirah/common/service/MerchantUserService.java
@@ -3,6 +3,7 @@ package com.jumeirah.common.service;
 import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
+import com.jumeirah.common.param.MerchantUserInfoParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
 import com.jumeirah.common.vo.MerchantUserQueryVo;
@@ -20,68 +21,68 @@ import java.util.List;
 */
 public interface MerchantUserService extends BaseService<MerchantUser> {
-        /**
+    /**
-         * 保存
+     * 保存
-         *
+     *
-         * @param merchantUser
+     * @param merchantUser
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        boolean saveMerchantUser(MerchantUser merchantUser) throws Exception;
+    boolean saveMerchantUser(MerchantUser merchantUser) throws Exception;
-        /**
+    /**
-         * 登录
+     * 登录
-         *
+     *
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        ApiResult<LoginMerUserTokenVo> login(MerchantLoginParam merchantLoginParam) throws Exception;
+    ApiResult<LoginMerUserTokenVo> login(MerchantLoginParam merchantLoginParam) throws Exception;
-        ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception;
+    ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception;
 //        ApiResult<Boolean> register(MerchantRegisterParam merchantRegisterParam) throws Exception;
-        /**
+    /**
-         * 修改
+     * 修改
-         *
+     *
-         * @param merchantUser
+     * @param merchantUser
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        boolean updateMerchantUser(MerchantUser merchantUser) throws Exception;
+    boolean updateMerchantUser(MerchantUser merchantUser) throws Exception;
-        /**
+    /**
-         * 删除
+     * 删除
-         *
+     *
-         * @param id
+     * @param id
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        boolean deleteMerchantUser(Long id) throws Exception;
+    boolean deleteMerchantUser(Long id) throws Exception;
-        /**
+    /**
-         * 根据ID获取查询对象
+     * 根据ID获取查询对象
-         *
+     *
-         * @param id
+     * @param id
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        MerchantUserQueryVo getMerchantUserById(Long id) throws Exception;
+    MerchantUserQueryVo getMerchantUserById(Long id) throws Exception;
-        /**
+    /**
-         * 获取分页对象
+     * 获取分页对象
-         *
+     *
-         * @param merchantUserPageParam
+     * @param merchantUserPageParam
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        Paging<MerchantUserQueryVo> getMerchantUserPageList(MerchantUserPageParam merchantUserPageParam) throws Exception;
+    Paging<MerchantUserQueryVo> getMerchantUserPageList(MerchantUserPageParam merchantUserPageParam) throws Exception;
-        List<MerchantUserQueryVo> getMerchantUserListByMcId(Long mcId) throws Exception;
+    List<MerchantUserQueryVo> getMerchantUserListByMcId(Long mcId) throws Exception;
+    ApiResult<List<MerchantUser>> getMerchantUserListByMcIdAndIds(MerchantUserInfoParam merchantUserInfoParam);
 }
--- a/common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
@@ -12,6 +12,7 @@ import com.jumeirah.common.enums.StateEnum;
 import com.jumeirah.common.mapper.MerchantUserMapper;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
+import com.jumeirah.common.param.MerchantUserInfoParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.service.MerchantPermissionService;
 import com.jumeirah.common.service.MerchantService;
@@ -331,8 +332,13 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
    @Override
    public List<MerchantUserQueryVo> getMerchantUserListByMcId(Long mcId) throws Exception {
        return merchantUserMapper.getMerchantUserListByMcId(mcId);
    }
+    @Override
+    public ApiResult<List<MerchantUser>> getMerchantUserListByMcIdAndIds(MerchantUserInfoParam merchantUserInfoParam) {
+        return ApiResult.ok(baseMapper.selectList(new QueryWrapper<MerchantUser>().lambda()
+                .eq(MerchantUser::getMcId, merchantUserInfoParam.getMcId()).in(MerchantUser::getId, merchantUserInfoParam.getMcUserIds())));
+    }
 }
--- a/common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.enums.StrokeStatusEnum;
 import com.jumeirah.common.mapper.StrokeMapper;
+import com.jumeirah.common.mq.Queue;
 import com.jumeirah.common.param.McStrokePageParam;
 import com.jumeirah.common.param.McStrokePaymentPageParam;
 import com.jumeirah.common.param.StrokePageParam;
@@ -35,12 +36,19 @@ import org.springframework.transaction.annotation.Transactional;
 public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> implements StrokeService {
    @Autowired
+    private Queue queue;
+    @Autowired
    private StrokeMapper strokeMapper;
-    @Transactional(rollbackFor = Exception.class)
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public boolean saveStroke(Stroke stroke) throws Exception {
-        return super.save(stroke);
+        final boolean save = super.save(stroke);
+        if (save) {//推送订单到客服系统
+            queue.pushOrder(stroke);
+        }
+        return save;
    }
    @Transactional(rollbackFor = Exception.class)
@@ -93,7 +101,7 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
        Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.desc("s.create_time"));
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
        // 查询已完成 需要额外查询已取消状态
-        if (strokePageParam.getStatus().equals(StrokeStatusEnum.COMPLETED.getCode())){
+        if (strokePageParam.getStatus().equals(StrokeStatusEnum.COMPLETED.getCode())) {
            IPage<StrokeQueryVo> iPage = strokeMapper.getStrokePageListWithFinish(page, strokePageParam, jwtToken.getUserId());
            return new Paging<StrokeQueryVo>(iPage);
        }

--- a/config/src/main/resources/config/application-dev.yml
+++ b/config/src/main/resources/config/application-dev.yml
@@ -25,6 +25,14 @@ spring:
    password: 123456
    port: 6379
+  rabbitmq:
+    host: 47.99.47.225
+    port: 5672
+    username: root
+    password: root
+    user-queue-name: disable.user.dev
+    order-queue-name: push.order
 # 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
 mybatis-plus:
  configuration:

--- a/customer-service/src/main/java/com/ym/im/entity/Stroke.java
+++ b/customer-service/src/main/java/com/ym/im/entity/Stroke.java
+package com.ym.im.entity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+/**
+ * 行程表
+ *
+ * @author wei
+ * @since 2020-09-29
+ */
+@Data
+@Accessors(chain = true)
+public class Stroke implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键ID")
+    private Long id;
+    @ApiModelProperty("出发城市id")
+    private Long cityOutsetId;
+    @ApiModelProperty("逻辑删除，0：未删除，1：已删除")
+    private Integer deleted;
+    @ApiModelProperty("出发城市名称")
+    private String cityOutsetName;
+    @ApiModelProperty("到达城市id")
+    private Long cityArriveId;
+    @ApiModelProperty("到达城市名称")
+    private String cityArriveName;
+    @ApiModelProperty("人数")
+    private Integer peopleNum;
+    @ApiModelProperty("飞机型号ID")
+    private Long plainTypeId;
+    @ApiModelProperty("出发时间")
+    private Timestamp outsetTime;
+    @ApiModelProperty("返程时间")
+    private Timestamp returnTime;
+    @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
+    private Integer type;
+    @ApiModelProperty("状态，0-审核中，1-进行中，2-已完成，99-取消")
+    private Integer status;
+    @ApiModelProperty("创建时间")
+    private Timestamp createTime;
+    @ApiModelProperty("更新时间")
+    private Timestamp updateTime;
+    @ApiModelProperty("付款时间")
+    private Timestamp userRechargeTime;
+    @ApiModelProperty("货物名称")
+    private String goodsName;
+    @ApiModelProperty("货物体积（长*宽*高） 单位：CM，例如：100*102*120")
+    private String goodsSize;
+    @ApiModelProperty("货物重量，单位：吨")
+    private String goodsWeight;
+    @ApiModelProperty("病人疾病名称")
+    private String diseaseName;
+    @ApiModelProperty("病人病情诊断书")
+    private String medicalCertificateUrl;
+    @ApiModelProperty("配备器械（格式：1,2,3）逗号分隔")
+    private String instruments;
+    @ApiModelProperty("医护人员，0-医生，1-护士，2-护工（格式：0,1,2）逗号分隔")
+    private String medicalPersons;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("价格")
+    private BigDecimal money;
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    @ApiModelProperty("出发机场名称")
+    private String outsetAirportName;
+    @ApiModelProperty("到达机场名称")
+    private String arriveAirportName;
+    @ApiModelProperty("返程飞机型号ID")
+    private Long arrivePlainTypeId;
+    @ApiModelProperty("返程出发机场名称")
+    private String backOutsetAirportName;
+    @ApiModelProperty("返程到达机场名称")
+    private String backArriveAirportName;
+    @ApiModelProperty("商家id")
+    private Long mcId;
+    @ApiModelProperty("用户选择机型")
+    private String choosePlainType;
+    @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+    private Integer paymentStatus;
+    @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
+    private Integer auditStatus;
+    @ApiModelProperty("用户充值金额")
+    private BigDecimal userRechargeMoney;
+    @ApiModelProperty("用户充值银行名称")
+    private String userRechargeBank;
+    @ApiModelProperty("用户充值账户名")
+    private String userRechargeName;
+    @ApiModelProperty("用户充值卡号")
+    private String userRechargeBankNumber;
+    @ApiModelProperty("用户充值截图证据,  传入数组")
+    private String userRechargeCredentialsUrl;
+    @ApiModelProperty("是否是优惠调机，0-否，1-是")
+    private Boolean isDiscount;
+}
--- a/customer-service/src/main/java/com/ym/im/service/impl/StaffSingleChatServiceImpl.java
+++ b/customer-service/src/main/java/com/ym/im/service/impl/StaffSingleChatServiceImpl.java
@@ -27,6 +27,8 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import static com.ym.im.entity.ChatRecord.RECEIVE;
@@ -104,7 +106,9 @@ public class StaffSingleChatServiceImpl implements ChatService {
        final UserSocketInfo userSocketInfo = channelGroup.USER_GROUP.get(userId);
        if (userSocketInfo == null) {
            //用户不在线,保存最后发送消息的客服ID
-            redisTemplate.opsForHash().put(NettyConstant.IM_USERS, userId, id);
+            Map<Long, Long> staff = new HashMap<>();
+            staff.put(merchantId, id);
+            redisTemplate.opsForHash().put(NettyConstant.IM_USERS, userId, staff);
            //推送通知
            pushNotifications(userId);
            return null;

--- a/customer-service/src/main/resources/application-test.yml
+++ b/customer-service/src/main/resources/application-test.yml
@@ -36,7 +36,7 @@ spring:
      simple:
        default-requeue-rejected: false
  redis:
-    database: 5
+    database: 0
    host: 127.0.0.1
    port: 6379
    password: temple123456