添加校验卡号和人脸不为空才发送

src/main/java/com/usky/dxtop/controller/web/OrderController.java

@@ -83,17 +83,6 @@ public class OrderController extends BaseController {
         return AjaxResult.success(orderService.getTopScanPayApi(order));
     }
 
-    /**
-     * 生成扫码支付二维码
-     * @param order
-     * @return
-     */
-    @RepeatSubmit
-    @PostMapping("/topScanPayQr")
-    public AjaxResult getTopScanPayQr(@RequestBody Order order){
-        return AjaxResult.success(orderService.getTopScanPayQr(order));
-    }
-
     /**
      * 查看订单详情api
      * @param orderNumber

src/main/java/com/usky/dxtop/service/OrderService.java

@@ -48,13 +48,6 @@ public interface OrderService extends IService<Order> {
      */
     String getTopScanPayApi(Order order);
 
-    /**
-     * 生成扫码支付二维码(后台充值)
-     * @param order
-     * @return
-     */
-    String getTopScanPayQr(Order order);
-
     /**
      * 查看订单详情api
      * @param orderNumber

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -15,7 +15,6 @@ import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.*;
 import com.usky.dxtop.common.utils.http.HttpUtils;
-import com.usky.dxtop.common.utils.sign.Base64;
 import com.usky.dxtop.mapper.OrderMapper;
 import com.usky.dxtop.model.*;
 import com.usky.dxtop.service.*;
@@ -42,11 +41,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
@@ -160,31 +156,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return String.format("%s?%s", topApiConfiger.scanPayUrl, topApiConfiger.generateParam(params));
     }
 
-    /**
-     * 后台充值(支付宝或者现金)
-     * @param order
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public String getTopScanPayQr(Order order) {
-        order.setScene(OrderSceneCode.BACK_STAGE.getCode());
-        String encode;
-        try {
-            //获取url
-            String topScanPayApi = getTopScanPayApi(order);
-            //生成二维码
-            BufferedImage image = QRCodeUtil.encode(topScanPayApi, null, true);
-            // 转换流信息写出
-            FastByteArrayOutputStream os = new FastByteArrayOutputStream();
-            ImageIO.write(image, "jpg", os);
-            encode = Base64.encode(os.toByteArray());
-        }catch (Exception e){
-            throw new CustomException("生成二维码失败"+e.getMessage());
-        }
-        return encode;
-    }
-
     /**
      * 查询支付订单api
      * @param orderNumber

src/main/java/com/usky/dxtop/service/job/SmJob.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.common.utils.http.HttpUtils;
 import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.model.MsgLog;
@@ -18,7 +19,6 @@ import com.usky.dxtop.service.config.rabbitmq.group.GroupConsumeConfig;
 import com.usky.dxtop.service.config.rabbitmq.profile.ProfileConsumeConfig;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.core.util.JsonUtils;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,11 +101,14 @@ public class SmJob {
                     date.setSId(staff.getSId());
                     staffService.updateById(date);
                 }
-                //TODO 判断人脸和卡号不为空才发送
                 //发送人员信息
-                personSendMessage(date,type);
+                if (StringUtils.isNotBlank(date.getCardId())){
+                    personSendMessage(date,type);
+                }
                 //发送人脸信息
-                faceSendMessage(date);
+                if (StringUtils.isNotBlank(date.getFaceId())){
+                    faceSendMessage(date);
+                }
             });
             return list.isEmpty();
         });
@@ -179,7 +182,7 @@ public class SmJob {
         map.put("mob",staff.getId());
         Map dept = JSON.parseObject(staff.getDept(), Map.class);
         map.put("groupid",dept.get("id"));
-        map.put("tel","");
+        map.put("tel",staff.getContacts());
         map.put("level_name","");
         MsgLog msgLog = new MsgLog();
         msgLog.setBusinessId(staff.getSId());