订单添加卡号

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

@@ -1,7 +1,5 @@
 package com.usky.dxtop.controller.web;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.dxtop.common.core.domain.AjaxResult;
 import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.model.Staff;
@@ -111,18 +109,17 @@ public class StaffController {
         return AjaxResult.success(staffService.one(id,phone,card));
     }
 
-    @GetMapping("send")
-    public String sendDeptAndStaff(@RequestParam Long staffId,
-                                 @RequestParam  String card,
-                                 @RequestParam  Integer type){
-        Staff staff = staffService.getById(staffId);
-        staff.setCardId(card);
-        LambdaQueryWrapper<Dept> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Dept::getId,staff.getDeptId());
-        Dept dept = deptService.getOne(queryWrapper);
-        smJob.deptSendMessage(dept);
+    @GetMapping("sendDept")
+    public String sendDeptAndStaff(@RequestParam Long id){
+        Dept byId = deptService.getById(id);
+        smJob.deptSendMessage(byId);
+        return "sucess";
+    }
+
+    @GetMapping("sendPerson")
+    public String sendPerson(Long id,Integer type){
+        Staff staff = staffService.getById(id);
         smJob.personSendMessage(staff,type);
-        smJob.faceSendMessage(staff);
         return "sucess";
     }
 

src/main/java/com/usky/dxtop/model/Order.java

@@ -102,7 +102,9 @@ public class Order extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String openId;
 
-    @TableField(exist = false)
+    /**
+     * 卡号
+     */
     private String card;
     /**
      * 真实到账比例

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

@@ -182,11 +182,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             ChargeVO chargeVo = new ChargeVO();
             chargeVo.setSeq(order.getId());
             chargeVo.setAmt(order.getMoney());
-            if (null != order.getRealMoney() && order.getMoney().compareTo(BigDecimal.ZERO)  != 0){
+            if (null != order.getRealMoney() && order.getRealMoney().compareTo(BigDecimal.ZERO)  != 0){
                 chargeVo.setAmt(order.getRealMoney());
             }
             chargeVo.setCard(order.getCard());
-            chargeVo.setMob(order.getOrderNumber());
             MsgLog msgLog = new MsgLog();
             msgLog.setBusinessId(order.getId());
             msgLog.setExchange(ChargeConsumeConfig.NAME);

src/main/java/com/usky/dxtop/service/vo/ChargeVO.java

@@ -16,8 +16,4 @@ public class ChargeVO {
     private String card;
 
     private BigDecimal amt;
-
-    private String name;
-
-    private String mob;
 }