修改充值记录bug,监听队列添加返回值

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

@@ -19,5 +19,5 @@ public interface MsgLogService extends IService<MsgLog> {
     Boolean isRepetition(MsgLog msgLog);
 
 
-    void consumerSuccess(Long id);
+    void consumerSuccess(Long id,String consequence);
 }

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

@@ -28,7 +28,7 @@ public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> impleme
                 chargeRequest.getEndTime(),chargeRequest.getCart(),
                 chargeRequest.getNameOrPhone(),chargeRequest.getUserId()
         );
-        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
 
     @Override

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

@@ -32,7 +32,7 @@ public class DishServiceImpl extends ServiceImpl<DishMapper, Dish> implements Di
         IPage<Dish> page = new Page<>(dishRequest.getCurrent(), dishRequest.getSize());
         page = baseMapper.page(page,dishRequest.getStartTime(),dishRequest.getEndTime(),dishRequest.getCart(),
                 dishRequest.getNameOrPhone(),dishRequest.getUserId());
-        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
 
     @Override

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

@@ -6,8 +6,6 @@ import com.usky.dxtop.model.MsgLog;
 import com.usky.dxtop.service.MsgLogService;
 import com.usky.dxtop.service.emun.MsgLogStatus;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 /**
@@ -28,9 +26,10 @@ public class MsgLogServiceImpl extends ServiceImpl<MsgLogMapper, MsgLog> impleme
     }
 
     @Override
-    public void consumerSuccess(Long id) {
+    public void consumerSuccess(Long id,String consequence) {
         MsgLog msgLog = this.getById(id);
         if (this.isRepetition(msgLog)){
+            msgLog.setConsequence(consequence);
             msgLog.setMsgFlag(MsgLogStatus.CONSUMER_SUCCESS.getCode());
             this.updateById(msgLog);
         }

src/main/java/com/usky/dxtop/service/listener/ChargeMqListener.java

@@ -51,6 +51,7 @@ public class ChargeMqListener {
                     order.setOrderFlag(OrderStatus.PAYMENT_ERROR_DEBIT.getCode());
                 }
                 orderService.updateById(order);
+                msgLog.setConsequence(s);
                 msgLog.setMsgFlag(MsgLogStatus.CONSUMER_SUCCESS.getCode());
                 msgLogService.updateById(msgLog);
             }

src/main/java/com/usky/dxtop/service/listener/FaceMqListener.java

@@ -31,7 +31,7 @@ public class FaceMqListener {
             log.info("charge_trans_produce:接受到的消息"+s);
             JSONObject jsonObject = JSONObject.parseObject(s);
             Long msgId = Long.parseLong(jsonObject.get("seq").toString());
-            msgLogService.consumerSuccess(msgId);
+            msgLogService.consumerSuccess(msgId,s);
         } catch (Exception e) {
             log.info("charge_trans_produce"+"异常信息：" + e.getMessage());
         } finally {

src/main/java/com/usky/dxtop/service/listener/GroupMqListener.java

@@ -31,7 +31,7 @@ public class GroupMqListener {
             log.info("charge_trans_produce:接受到的消息"+s);
             JSONObject jsonObject = JSONObject.parseObject(s);
             Long msgId = Long.parseLong(jsonObject.get("seq").toString());
-            msgLogService.consumerSuccess(msgId);
+            msgLogService.consumerSuccess(msgId,s);
         } catch (Exception e) {
             log.info("charge_trans_produce"+"异常信息：" + e.getMessage());
         } finally {

src/main/java/com/usky/dxtop/service/listener/PersonMqListener.java

@@ -31,7 +31,7 @@ public class PersonMqListener {
             log.info("charge_trans_produce:接受到的消息"+s);
             JSONObject jsonObject = JSONObject.parseObject(s);
             Long msgId = Long.parseLong(jsonObject.get("seq").toString());
-            msgLogService.consumerSuccess(msgId);
+            msgLogService.consumerSuccess(msgId,s);
         } catch (Exception e) {
             log.info("charge_trans_produce"+"异常信息：" + e.getMessage());
         } finally {