From 491372c3bffec87342f9f7f5546e2e83d5645d67 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 04 Feb 2024 18:09:06 +0800
Subject: [PATCH] 确认收货更新用户的会员信息

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java |   48 ++++++++++++++++++++++++++++--------------------
 1 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
index b4e3807..5b392b1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
@@ -53,6 +53,7 @@
     private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
     private final IMallMoneyFlowService mallMoneyFlowService;
     private final AgentProducer agentProducer;
+    private final MallMemberSpeakMapper mallMemberSpeakMapper;
 
     @Override
     public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
@@ -313,19 +314,19 @@
         if(ObjectUtil.isEmpty(mallProductBuyRecord)){
             throw new FebsException("记录不存在");
         }
-        Integer state = mallProductBuyRecord.getState();
-        if(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue() != state){
-            throw new FebsException("记录不是待支付状态");
-        }
+//        Integer state = mallProductBuyRecord.getState();
+//        if(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue() != state){
+//            throw new FebsException("记录不是待支付状态");
+//        }
 
         MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(mallProductBuyRecord.getSellRecordId());
         if(ObjectUtil.isEmpty(mallProductSellRecord)){
             throw new FebsException("记录不存在");
         }
-        Integer stateSell = mallProductSellRecord.getState();
-        if(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue() != stateSell){
-            throw new FebsException("记录不是待支付状态");
-        }
+//        Integer stateSell = mallProductSellRecord.getState();
+//        if(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue() != stateSell){
+//            throw new FebsException("记录不是待支付状态");
+//        }
 
         DateTime payTime = DateUtil.date();
         mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_PAY.getValue());
@@ -364,19 +365,19 @@
         if(ObjectUtil.isEmpty(mallProductBuyRecord)){
             throw new FebsException("记录不存在");
         }
-        Integer state = mallProductBuyRecord.getState();
-        if(ProductEnum.PRODUCT_MATE_STATE_PAY.getValue() != state){
-            throw new FebsException("记录不是已支付状态");
-        }
+//        Integer state = mallProductBuyRecord.getState();
+//        if(ProductEnum.PRODUCT_MATE_STATE_PAY.getValue() != state){
+//            throw new FebsException("记录不是已支付状态");
+//        }
         Long sellRecordId = mallProductBuyRecord.getSellRecordId();
         MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(mallProductBuyRecord.getSellRecordId());
         if(ObjectUtil.isEmpty(mallProductSellRecord)){
             throw new FebsException("记录不存在");
         }
-        Integer stateSell = mallProductSellRecord.getState();
-        if(ProductEnum.PRODUCT_MATE_STATE_PAY.getValue() != stateSell){
-            throw new FebsException("记录不是已支付状态");
-        }
+//        Integer stateSell = mallProductSellRecord.getState();
+//        if(ProductEnum.PRODUCT_MATE_STATE_PAY.getValue() != stateSell){
+//            throw new FebsException("记录不是已支付状态");
+//        }
 
         mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_CONFIRM.getValue());
         mallProductBuyRecordMapper.updateById(mallProductBuyRecord);
@@ -394,10 +395,10 @@
         if(ObjectUtil.isEmpty(mallProductBuyRecord)){
             throw new FebsException("记录不存在");
         }
-        Integer state = mallProductBuyRecord.getState();
-        if(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue() != state){
-            throw new FebsException("记录不是待支付状态");
-        }
+//        Integer state = mallProductBuyRecord.getState();
+//        if(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue() != state){
+//            throw new FebsException("记录不是待支付状态");
+//        }
         Long sellRecordId = mallProductBuyRecord.getSellRecordId();
         //更新买单子表的数据
         mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_FAIL.getValue());
@@ -417,4 +418,11 @@
         mallProductSellMapper.updateById(mallProductSell);
         return new FebsResponse().success();
     }
+
+    @Override
+    public IPage<MallMemberSpeak> getSpeakList(MallMemberSpeak mallMemberSpeak, QueryRequest request) {
+        Page<MallMemberSpeak> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MallMemberSpeak> adminMallNewsInfoVoIPage = mallProductSellMapper.getSpeakListInPage(page, mallMemberSpeak);
+        return adminMallNewsInfoVoIPage;
+    }
 }

--
Gitblit v1.9.1