修复后台管理端邀请专家，专家接受不到横屏消息问题

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/controller/LiftCaseController.java

@@ -167,7 +167,7 @@ public class LiftCaseController extends BaseController<LiftCaseEntity, LiftCaseQ
     }
 
     @PutMapping("/invitationExpert")
-    @ApiOperation(value = "邀请专家")
+    @ApiOperation(value = "邀请专家,监控中心调用")
     public RestResponse invitationExpert(@RequestBody LiftCaseEntity liftCaseEntity) {
         return liftCaseService.invitationExpert(liftCaseEntity);
     }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/service/impl/LiftCaseServiceImpl.java

@@ -905,17 +905,21 @@ public class LiftCaseServiceImpl extends ServiceImpl<LiftCaseMapper, LiftCaseEnt
 
     @Override
     public RestResponse invitationExpert(LiftCaseEntity liftCaseEntity) {
-        LiftCaseEntity selectById = caseMapper.selectById(liftCaseEntity.getId());
-        if (selectById.getIsPlatformSpecified() == 1) {
-            if (selectById.getDataTable() == 1 && selectById.getStatuz() == 1) {
+        LiftCaseEntity liftCase = caseMapper.selectById(liftCaseEntity.getId());
+        if (liftCase.getIsPlatformSpecified() == 1) {
+            if (liftCase.getDataTable() == 1 && liftCase.getStatuz() == 1) {
                 caseMapper.invitationExpert(liftCaseEntity.getId(), liftCaseEntity.getChargerId());
             }
-            if (selectById.getStatuz() == 8) {
+            if (liftCase.getStatuz() == 8) {
                 caseMapper.invitationExpert(liftCaseEntity.getId(), liftCaseEntity.getChargerId());
             }
-            if (selectById.getDataTable() == 2 && selectById.getStatuz() == 0) {
+            if (liftCase.getDataTable() == 2 && liftCase.getStatuz() == 0) {
                 caseMapper.invitationExpert(liftCaseEntity.getId(), liftCaseEntity.getChargerId());
             }
+
+            PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(liftCaseEntity.getChargerId().toString());
+            PushMessage pushMessage = PushMessage.orderChargeStatus("接入，请及时跟进！");
+            pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfo);
         } else {
             return RestResponse.fail("该订单无法再次邀请专家");
         }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/pay/controller/AlipayController.java

@@ -1,13 +1,10 @@
 package cn.com.ty.lift.ud.pay.controller;
 
-import cn.com.ty.lift.ud.chat.mapper.entity.ChatSessionEntity;
 import cn.com.ty.lift.ud.chat.mapper.entity.LiftCaseEntity;
 import cn.com.ty.lift.ud.chat.service.IChatSessionService;
 import cn.com.ty.lift.ud.chat.service.ILiftCaseService;
 import cn.com.ty.lift.ud.common.RandomizingID;
-import cn.com.ty.lift.ud.operation.mapper.entity.CommissionSettingEntity;
 import cn.com.ty.lift.ud.operation.mapper.entity.UserLevelRuleEntity;
-import cn.com.ty.lift.ud.operation.mapper.entity.UserRebateRuleEntity;
 import cn.com.ty.lift.ud.operation.mapper.entity.VipFeeSettingEntity;
 import cn.com.ty.lift.ud.operation.service.ICommissionSettingService;
 import cn.com.ty.lift.ud.operation.service.IUserLevelRuleService;
@@ -30,21 +27,16 @@ import cn.com.ty.lift.ud.payment.service.IUserRechargeDetailService;
 import cn.com.ty.lift.ud.payment.service.IUserWithdrawService;
 import cn.com.ty.lift.ud.question.mapper.QuestionBankMapper;
 import cn.com.ty.lift.ud.question.mapper.entity.QuestionBankEntity;
-import cn.com.ty.lift.ud.question.mapper.entity.QuestionOperateEntity;
 import cn.com.ty.lift.ud.question.service.IQuestionOperateService;
 import cn.com.ty.lift.ud.schoolVideo.mapper.entity.SchoolVideoEntity;
-import cn.com.ty.lift.ud.schoolVideo.mapper.entity.SchoolVideoOperateEntity;
 import cn.com.ty.lift.ud.schoolVideo.service.ISchoolVideoOperateService;
 import cn.com.ty.lift.ud.schoolVideo.service.ISchoolVideoService;
 import cn.com.ty.lift.ud.tableDict.service.ITableDictService;
-import cn.com.ty.lift.ud.userAccount.mapper.entity.UserAccount;
 import cn.com.ty.lift.ud.userAccount.service.IUserAccountService;
 import cn.com.ty.lift.ud.userInfo.mapper.UserInfoMapper;
 import cn.com.ty.lift.ud.userInfo.mapper.entity.UserInfoEntity;
 import cn.com.ty.lift.ud.userInfo.service.IUserInfoService;
-import cn.com.ty.lift.ud.userRebate.mapper.entity.UserRebateEntity;
 import cn.com.ty.lift.ud.userRebate.service.IUserRebateService;
-import cn.com.ty.lift.ud.utils.QrCodeUtil;
 import cn.com.ty.lift.ud.utils.UUIDUtil;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.alibaba.fastjson.JSON;
@@ -83,7 +75,7 @@ import java.util.*;
 
 /**
  * 支付宝前端控制器
- * 
+ *
  * @author IyesKing
  * @date 2020年5月15日
  */
@@ -92,46 +84,46 @@ import java.util.*;
 @RestController
 @RequestMapping("/api")
 public class AlipayController {
-
-    private @Autowired AlipayConfig alipayConfig;
-
-    private @Autowired AlipaySupport alipaySupport;
-
-    private @Autowired ILiftCaseService liftCaseService;
-
-    private @Autowired IChatSessionService chatSessionService;
-
-    private @Autowired IUserBillService userBillService;
-
-    private @Autowired IUserRechargeDetailService userRechargeDetailService;
-
-    private @Autowired IUserInfoService userInfo;
-
-    private @Autowired QuestionBankMapper questionBankMapper;
-
-    private @Autowired IQuestionOperateService iQuestionOperateService;
-
-    private @Autowired ICommissionSettingService iCommissionSettingService;
-
-    private @Autowired IUserBillService iUserBillService;
-
-    private @Autowired ITyBillService iTyBillService;
-
-    private @Autowired ISchoolVideoOperateService schoolVideoOperateService;
-
-    private @Autowired ISchoolVideoService schoolVideoService;
-
-    private @Autowired ITableDictService tableDictService;
-
-    private @Autowired IVipFeeSettingService vipFeeSettingService;
-
-    private @Autowired IUserRebateService iUserRebateService;
-
-    private @Autowired UserInfoMapper userInfoMapper;
-
-    private @Autowired IUserLevelRuleService iUserLevelRuleService;
-
-    private @Autowired IUserWithdrawService userWithdrawService;
+    @Autowired
+    private AlipayConfig alipayConfig;
+    @Autowired
+    private AlipaySupport alipaySupport;
+    @Autowired
+    private ILiftCaseService liftCaseService;
+    @Autowired
+    private IChatSessionService chatSessionService;
+    @Autowired
+    private IUserBillService userBillService;
+    @Autowired
+    private IUserRechargeDetailService userRechargeDetailService;
+    @Autowired
+    private IUserInfoService userInfo;
+    @Autowired
+    private QuestionBankMapper questionBankMapper;
+    @Autowired
+    private IQuestionOperateService iQuestionOperateService;
+    @Autowired
+    private ICommissionSettingService iCommissionSettingService;
+    @Autowired
+    private IUserBillService iUserBillService;
+    @Autowired
+    private ITyBillService iTyBillService;
+    @Autowired
+    private ISchoolVideoOperateService schoolVideoOperateService;
+    @Autowired
+    private ISchoolVideoService schoolVideoService;
+    @Autowired
+    private ITableDictService tableDictService;
+    @Autowired
+    private IVipFeeSettingService vipFeeSettingService;
+    @Autowired
+    private IUserRebateService iUserRebateService;
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+    @Autowired
+    private IUserLevelRuleService iUserLevelRuleService;
+    @Autowired
+    private IUserWithdrawService userWithdrawService;
 
     @Autowired
     private IUserAccountService iUserAccountService;
@@ -144,7 +136,7 @@ public class AlipayController {
 
     /**
      * 支付宝-电脑网站支付
-     * 
+     *
      * @param response
      * @param money
      * @param outTradeNo
@@ -152,7 +144,7 @@ public class AlipayController {
     @ApiOperation("支付宝-电脑网站支付")
     @GetMapping("/alipay/pc")
     public void alipayPc(HttpServletResponse response, @RequestParam("money") String money,
-        @RequestParam("outTradeNo") String outTradeNo) {
+                         @RequestParam("outTradeNo") String outTradeNo) {
         log.info("====进入【支付宝-电脑网站支付】====");
         if (StringUtils.isBlank(money) || StringUtils.isBlank(outTradeNo)) {
             log.error("支付金额、订单号参数不能为空。");
@@ -189,9 +181,8 @@ public class AlipayController {
 
     /**
      * 支付宝-诊单APP支付
-     * 
-     * @param pay
-     *            订单对象
+     *
+     * @param pay 订单对象
      * @return
      */
     @ApiOperation("APP支付宝-诊单支付")
@@ -274,9 +265,8 @@ public class AlipayController {
 
     /**
      * 支付宝-打赏APP支付
-     * 
-     * @param pay
-     *            订单对象
+     *
+     * @param pay 订单对象
      * @return
      */
     @ApiOperation("APP支付宝-打赏支付")
@@ -365,7 +355,7 @@ public class AlipayController {
 
     /**
      * APP支付宝-查询商户余额
-     * 
+     *
      * @return
      */
     @ApiOperation("APP支付宝-查询商户余额")
@@ -386,9 +376,8 @@ public class AlipayController {
 
     /**
      * 支付宝-APP用户充值
-     * 
-     * @param pay
-     *            订单对象
+     *
+     * @param pay 订单对象
      * @return
      */
     @ApiOperation("支付宝-APP用户充值")
@@ -428,7 +417,7 @@ public class AlipayController {
             model.setSubject(alipayConfig.getSubjectName());
             // 公用回传参数
             String passbackParams =
-                assemblePassbackParams(PassbackEnum.RECHARGE_PAY.getCode(), "用户充值", rechargeDetail.getUserId(), null);
+                    assemblePassbackParams(PassbackEnum.RECHARGE_PAY.getCode(), "用户充值", rechargeDetail.getUserId(), null);
             model.setPassbackParams(passbackParams);
 
             // 设置支付宝异步回调接口地址
@@ -450,9 +439,8 @@ public class AlipayController {
 
     /**
      * 支付宝-WEB提现打款
-     * 
-     * @param pay
-     *            订单对象
+     *
+     * @param pay 订单对象
      * @return
      */
 //    @CrossOrigin
@@ -498,7 +486,7 @@ public class AlipayController {
             request.setBizModel(model);
             String appCert = AlipaySignature.getCertSN(alipayConfig.getAppCertPath());
             String apppayRootCert =
-                FileUtils.readFileToString(new File(alipayConfig.getAlipayRootCertPath()), Charsets.toCharset("utf-8"));
+                    FileUtils.readFileToString(new File(alipayConfig.getAlipayRootCertPath()), Charsets.toCharset("utf-8"));
 
             // 这里必须添加 app公匙证书的序列号和阿里根证书的序列号
             request.putOtherTextParam("app_cert_sn", appCert);
@@ -545,7 +533,7 @@ public class AlipayController {
 
                 //根据订单号找到之前的 用户流水记录，把支付宝的流水号更新到用户流水中
                 UserBillEntity billEntity = userBillService.getByFlowNum(pay.getOrders());
-                if(null != billEntity){
+                if (null != billEntity) {
                     billEntity.setFlowNum(alipayFundTrans.getPayFundOrderId());
                     userBillService.updateById(billEntity);
                 }
@@ -593,9 +581,8 @@ public class AlipayController {
 
     /**
      * 支付宝-充值成为VIP用户
-     * 
-     * @param pay
-     *            订单对象
+     *
+     * @param pay 订单对象
      * @return
      */
     @ApiOperation("APP支付宝-充值成为VIP用户")
@@ -649,7 +636,7 @@ public class AlipayController {
             model.setSubject(alipayConfig.getSubjectName());
             // 公用回传参数
             String passbackParams = assemblePassbackParams(PassbackEnum.RECHARGE_VIP_PAY.getCode(), orders.getName(),
-                pay.getUserId(), orders.getId().toString());
+                    pay.getUserId(), orders.getId().toString());
 
             model.setPassbackParams(passbackParams);
 
@@ -672,9 +659,8 @@ public class AlipayController {
 
     /**
      * 平台账户余额支付
-     * 
-     * @param pay
-     *            订单对象
+     *
+     * @param pay 订单对象
      * @return
      */
     @ApiOperation("平台账户余额支付")
@@ -710,7 +696,7 @@ public class AlipayController {
 
     /**
      * 余额打赏视频
-     * 
+     *
      * @param pay
      * @return
      */
@@ -765,7 +751,7 @@ public class AlipayController {
 
     /**
      * 余额打赏题库
-     * 
+     *
      * @param pay
      * @return
      */
@@ -819,7 +805,7 @@ public class AlipayController {
 
     /**
      * 余额支付出诊
-     * 
+     *
      * @param pay
      * @return
      */
@@ -863,7 +849,7 @@ public class AlipayController {
 
     /**
      * 余额支付问诊
-     * 
+     *
      * @param pay
      * @return
      */
@@ -907,7 +893,7 @@ public class AlipayController {
 
     /**
      * app支付回调
-     * 
+     *
      * @param response
      * @param request
      * @return 支付相关信息
@@ -987,11 +973,9 @@ public class AlipayController {
 
     /**
      * 获取两个时间点的月份差
-     * 
-     * @param dt1
-     *            第一个时间点,小的那个时间
-     * @param dt2
-     *            第二个时间点，大的那个时间
+     *
+     * @param dt1 第一个时间点,小的那个时间
+     * @param dt2 第二个时间点，大的那个时间
      * @return int，即需求的月数差
      */
     public static int monthDiff(LocalDateTime dt1, LocalDateTime dt2) {
@@ -1009,16 +993,16 @@ public class AlipayController {
 
     /**
      * 得到支付宝回调参数
-     * 
+     *
      * @param request
      * @return
      */
     private Map<String, String> alipayParamsMap(HttpServletRequest request) {
         Map<String, String> params = new HashMap<String, String>();
         Map<String, String[]> requestParams = request.getParameterMap();
-        for (Iterator<String> iter = requestParams.keySet().iterator(); iter.hasNext();) {
-            String name = (String)iter.next();
-            String[] values = (String[])requestParams.get(name);
+        for (Iterator<String> iter = requestParams.keySet().iterator(); iter.hasNext(); ) {
+            String name = (String) iter.next();
+            String[] values = (String[]) requestParams.get(name);
             String valueStr = "";
             for (int i = 0; i < values.length; i++) {
                 valueStr = (i == values.length - 1) ? valueStr + values[i] : valueStr + values[i] + ",";
@@ -1034,11 +1018,9 @@ public class AlipayController {
 
     /**
      * 封装支付宝验签结果。
-     * 
-     * @param params
-     *            验签字符串
-     * @param alipayCertPath
-     *            支付宝秘钥
+     *
+     * @param params         验签字符串
+     * @param alipayCertPath 支付宝秘钥
      * @return
      */
     private boolean alipaySignVerifiedResult(Map<String, String> params, String alipayCertPath) {
@@ -1057,19 +1039,15 @@ public class AlipayController {
     /**
      * 公用回传参数如果请求时传递了该参数，则返回给商户时会回传该参数。支付宝只会在同步返回（包括跳转回商户网站）和异步通知时将该参数原样返回。 本参数必须进行UrlEncode之后才可以发送给支付宝。
      *
-     * @param type
-     *            当前回调处理类型
-     * @param memo
-     *            一段描述
-     * @param userId
-     *            用户id
-     * @param dataId
-     *            操作数据id
+     * @param type   当前回调处理类型
+     * @param memo   一段描述
+     * @param userId 用户id
+     * @param dataId 操作数据id
      * @return
      * @throws UnsupportedEncodingException
      */
     private String assemblePassbackParams(Integer type, String memo, Long userId, String dataId)
-        throws UnsupportedEncodingException {
+            throws UnsupportedEncodingException {
         PassbackParamsDTO dto = new PassbackParamsDTO();
         dto.setType(type);
         dto.setMemo(memo);

lift-ud-service/src/main/java/cn/com/ty/lift/ud/pay/service/impl/WxpayServiceImpl.java

@@ -354,8 +354,7 @@ public class WxpayServiceImpl implements WxpayService {
         billUpEntity.setBalance(latestBalance);
         userBillService.save(billUpEntity);
 
-        PushUserInfo pushUserInfo =
-            iUserAccountService.getPushUserInfoByUserId(caseEntity.getChargerId().toString());
+        PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(caseEntity.getChargerId().toString());
         PushMessage pushMessage = PushMessage.orderChargeStatus("用戶已付款");
         pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfo);
         log.info("交易成功，处理业务代码完成");