会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/order/constant/OrderConstants.java

@@ -71,6 +71,9 @@ public final class OrderConstants
 
     public static final String CLOSE_TYPE_BUYER_CANCEL = "2";
 
+    /** 支付失败/退款关闭（含售后完结） */
+    public static final String CLOSE_TYPE_REFUND = "4";
+
     public static final String PAY_TYPE_WECHAT = "1";
 
     public static final String CONFIG_PAY_TIMEOUT_MINUTES = "order.pay.timeout.minutes";

baqing-shop/src/main/java/com/ruoyi/web/modules/order/mapper/BizOrderMapper.java

@@ -32,6 +32,9 @@ public interface BizOrderMapper
 
     int updateForPay(BizOrder order);
 
+    int updateForAftersaleClose(@Param("orderId") Long orderId, @Param("shopId") Long shopId,
+            @Param("closeType") String closeType, @Param("updateBy") String updateBy);
+
     int updateForCancelPay(@Param("orderId") Long orderId, @Param("memberId") Long memberId,
             @Param("closeType") String closeType);
 

baqing-shop/src/main/java/com/ruoyi/web/modules/order/service/impl/SellerAftersaleServiceImpl.java

@@ -4,14 +4,17 @@ import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.account.util.MemberMobileUtils;
 import com.ruoyi.web.modules.order.constant.OrderAppConstants;
+import com.ruoyi.web.modules.order.constant.OrderConstants;
 import com.ruoyi.web.modules.order.domain.BizOrderAftersale;
 import com.ruoyi.web.modules.order.dto.SellerAftersaleFinishDTO;
 import com.ruoyi.web.modules.order.dto.SellerAftersaleQuery;
 import com.ruoyi.web.modules.order.mapper.BizOrderAftersaleMapper;
+import com.ruoyi.web.modules.order.mapper.BizOrderMapper;
 import com.ruoyi.web.modules.order.service.ISellerAftersaleService;
 import com.ruoyi.web.modules.order.support.OrderAppSupport;
 import com.ruoyi.web.modules.order.vo.SellerAftersaleDetailVO;
@@ -23,6 +26,9 @@ public class SellerAftersaleServiceImpl implements ISellerAftersaleService
     @Autowired
     private BizOrderAftersaleMapper aftersaleMapper;
 
+    @Autowired
+    private BizOrderMapper orderMapper;
+
     @Autowired
     private OrderAppSupport orderAppSupport;
 
@@ -50,6 +56,7 @@ public class SellerAftersaleServiceImpl implements ISellerAftersaleService
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void finish(Long shopId, Long aftersaleId, SellerAftersaleFinishDTO dto, String operator)
     {
         BizOrderAftersale aftersale = aftersaleMapper.selectByIdAndShop(aftersaleId, shopId);
@@ -82,6 +89,7 @@ public class SellerAftersaleServiceImpl implements ISellerAftersaleService
         {
             throw new ServiceException(OrderAppConstants.MSG_AFTERSALE_ALREADY_FINISHED);
         }
+        orderMapper.updateForAftersaleClose(aftersale.getOrderId(), shopId, OrderConstants.CLOSE_TYPE_REFUND, operator);
     }
 
     private void enrichListRow(SellerAftersaleListRowVO row)

baqing-shop/src/main/resources/mapper/order/BizOrderMapper.xml

@@ -244,6 +244,18 @@
           and del_flag = '0'
     </update>
 
+    <update id="updateForAftersaleClose">
+        update biz_order
+        set order_status = '4',
+            close_type = #{closeType},
+            update_by = #{updateBy},
+            update_time = now()
+        where order_id = #{orderId}
+          and shop_id = #{shopId}
+          and order_status in ('1', '2', '3')
+          and del_flag = '0'
+    </update>
+
     <select id="selectExpiredPendingPay" resultMap="BizOrderResult">
         <include refid="selectOrderVo"/>
         where order_status = '0'

baqing-shop/src/test/java/com/ruoyi/web/modules/order/service/SellerAftersaleServiceImplTest.java

@@ -15,10 +15,12 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.web.modules.order.constant.OrderAppConstants;
+import com.ruoyi.web.modules.order.constant.OrderConstants;
 import com.ruoyi.web.modules.order.domain.BizOrderAftersale;
 import com.ruoyi.web.modules.order.dto.SellerAftersaleFinishDTO;
 import com.ruoyi.web.modules.order.dto.SellerAftersaleQuery;
 import com.ruoyi.web.modules.order.mapper.BizOrderAftersaleMapper;
+import com.ruoyi.web.modules.order.mapper.BizOrderMapper;
 import com.ruoyi.web.modules.order.service.impl.SellerAftersaleServiceImpl;
 import com.ruoyi.web.modules.order.support.OrderAppSupport;
 import com.ruoyi.web.modules.order.vo.SellerAftersaleDetailVO;
@@ -34,6 +36,9 @@ class SellerAftersaleServiceImplTest
     @Mock
     private BizOrderAftersaleMapper aftersaleMapper;
 
+    @Mock
+    private BizOrderMapper orderMapper;
+
     @Mock
     private OrderAppSupport orderAppSupport;
 
@@ -76,6 +81,7 @@ class SellerAftersaleServiceImplTest
         BizOrderAftersale aftersale = new BizOrderAftersale();
         aftersale.setAftersaleId(AFTERSALE_ID);
         aftersale.setShopId(SHOP_ID);
+        aftersale.setOrderId(500L);
         aftersale.setAftersaleStatus(OrderAppConstants.AFTERSALE_STATUS_IN_PROGRESS);
         when(aftersaleMapper.selectByIdAndShop(AFTERSALE_ID, SHOP_ID)).thenReturn(aftersale);
         when(aftersaleMapper.updateForFinish(any(BizOrderAftersale.class))).thenReturn(1);
@@ -86,6 +92,7 @@ class SellerAftersaleServiceImplTest
         sellerAftersaleService.finish(SHOP_ID, AFTERSALE_ID, dto, "seller01");
 
         verify(aftersaleMapper).updateForFinish(any(BizOrderAftersale.class));
+        verify(orderMapper).updateForAftersaleClose(500L, SHOP_ID, OrderConstants.CLOSE_TYPE_REFUND, "seller01");
     }
 
     @Test
@@ -104,6 +111,7 @@ class SellerAftersaleServiceImplTest
                 () -> sellerAftersaleService.finish(SHOP_ID, AFTERSALE_ID, dto, "seller01"));
         assertEquals(OrderAppConstants.MSG_AFTERSALE_ALREADY_FINISHED, ex.getMessage());
         verify(aftersaleMapper, never()).updateForFinish(any());
+        verify(orderMapper, never()).updateForAftersaleClose(any(), any(), any(), any());
     }
 
     @Test