修改log

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

@@ -7,14 +7,9 @@ import com.usky.dxtop.model.StaffRadio;
 import com.usky.dxtop.service.DeptService;
 import com.usky.dxtop.service.StaffRadioService;
 import com.usky.dxtop.service.StaffService;
-import com.usky.dxtop.service.config.rabbitmq.face.FaceConsumeConfig;
-import com.usky.dxtop.service.config.rabbitmq.group.GroupConsumeConfig;
-import com.usky.dxtop.service.config.rabbitmq.profile.ProfileConsumeConfig;
 import com.usky.dxtop.service.job.SmJob;
 import com.usky.dxtop.service.vo.StaffRequest;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -34,18 +29,6 @@ public class StaffController {
     private StaffService staffService;
     @Autowired
     private DeptService deptService;
-    @Autowired
-    @Qualifier(ProfileConsumeConfig.TEMPLATE)
-    private RabbitTemplate profileRabbitTemplate;
-
-
-    @Autowired
-    @Qualifier(FaceConsumeConfig.TEMPLATE)
-    private RabbitTemplate faceRabbitTemplate;
-
-    @Autowired
-    @Qualifier(GroupConsumeConfig.TEMPLATE)
-    private RabbitTemplate groupRabbitTemplate;
 
     @Autowired
     private SmJob smJob;

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

@@ -80,9 +80,9 @@ public class TopNotifyController {
                 callApiLogService.saveOrUpdate(merchantOrderNo,OrderServiceImpl.SCAN_PAY, topApiConfiger.scanPayUrl,null,JSONObject.toJSONString(tMap));
                 orderService.paySuccess(order);
             }
+            log.info("---订单回调---回调成功");
         }catch (Exception e){
             log.error("---订单回调"+e.getMessage());
         }
-        log.info("---订单回调---回调成功");
     }
 }

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

@@ -67,7 +67,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
         msgLog.setMsg(JSON.toJSONString(map));
         msgLogService.updateById(msgLog);
         CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-        rabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), msgLog.getMsg(),correlationData);
+        rabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
         return msgLog.getId().toString();
     }