Merge remote-tracking branch 'origin/test-230109' into test

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/DownloadOrderImpl.java

@@ -30,7 +30,7 @@ public class DownloadOrderImpl implements OrderStrategy {
 
     @Override
     public void handleOrder(String orderSn, String tradeNo, String openId, int paymentTypeName, Long spaceId) throws Exception {
-        DownloadOrder downloadOrder = downloadOrderService.getByOrderSn(orderSn);
+        DownloadOrder downloadOrder = downloadOrderService.getByOrderSnNoPay(orderSn);
         if (downloadOrder == null) {
             log.error("找不到订单：" + orderSn);
             throw new Exception("找不到订单，out_trade_no错误");

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/EntityOrderImpl.java

@@ -27,7 +27,7 @@ public class EntityOrderImpl implements OrderStrategy {
     @Override
     public void handleOrder(String orderSn, String tradeNo, String openId, int paymentTypeName, Long spaceId) throws Exception {
         log.warn("购物支付处理....");
-        Order orderEntity = orderService.getByOrderSn(orderSn);
+        Order orderEntity = orderService.getByOrderSnNoPay(orderSn);
         if (orderEntity == null) {
             log.error("找不到订单：" + orderSn);
             throw new Exception("找不到订单，out_trade_no错误");

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/ExpansionOrderImpl.java

@@ -27,7 +27,7 @@ public class ExpansionOrderImpl implements OrderStrategy {
 
     @Override
     public void handleOrder(String orderSn, String tradeNo, String openId, int paymentTypeName, Long spaceId) throws Exception {
-        ExpansionOrder expansionOrder = expansionOrderService.getByOrderSn(orderSn);
+        ExpansionOrder expansionOrder = expansionOrderService.getByOrderSnNoPay(orderSn);
         if (expansionOrder == null) {
             log.error("找不到订单：" + orderSn);
             throw new Exception("找不到订单，out_trade_no错误");

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/IncrementOrderImpl.java

@@ -34,7 +34,7 @@ public class IncrementOrderImpl implements OrderStrategy {
 
     @Override
     public void handleOrder(String orderSn, String tradeNo, String openId, int paymentTypeName, Long spaceId) throws Exception {
-        IncrementOrder responseIncrementOrder = incrementOrderService.getByOrderSn(orderSn);
+        IncrementOrder responseIncrementOrder = incrementOrderService.getByOrderSnNoPay(orderSn);
         if (responseIncrementOrder == null) {
             log.error("找不到订单：" + orderSn);
             throw new Exception("找不到订单，out_trade_no错误");

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/RechargeOrderImpl.java

@@ -21,7 +21,7 @@ public class RechargeOrderImpl implements OrderStrategy {
 
     @Override
     public void handleOrder(String orderSn, String tradeNo, String openId, int paymentTypeName, Long spaceId) throws Exception {
-        VirtualOrder responseVirtualOrder = virtualOrderService.getByOrderSn(orderSn);
+        VirtualOrder responseVirtualOrder = virtualOrderService.getByOrderSnNoPay(orderSn);
         if (responseVirtualOrder == null) {
             log.error("找不到订单：" + orderSn);
             throw new Exception("找不到订单，out_trade_no错误");

src/main/java/com/fdkankan/ucenter/service/IDownloadOrderService.java

@@ -26,6 +26,8 @@ public interface IDownloadOrderService extends IService<DownloadOrder> {
     boolean paySuccessDownloadOrder(String orderSn, String tradeNo, int paymentTypeName);
 
     DownloadOrder insertDownloadOrder(Long id, DownNumParam param, BigDecimal bigDecimal);
+
+    DownloadOrder getByOrderSnNoPay(String orderSn);
 }
 
 

src/main/java/com/fdkankan/ucenter/service/IExpansionOrderService.java

@@ -26,4 +26,6 @@ public interface IExpansionOrderService extends IService<ExpansionOrder> {
     boolean paySuccessExpansionOrder(String orderSn, String tradeNo, int paymentTypeName, int status);
 
     List<ExpansionOrder> getByCameraId(Long cameraId);
+
+    ExpansionOrder getByOrderSnNoPay(String orderSn);
 }

src/main/java/com/fdkankan/ucenter/service/IIncrementOrderService.java

@@ -33,4 +33,6 @@ public interface IIncrementOrderService extends IService<IncrementOrder> {
      IncrementOrder getByOrderSn(String orderSn);
 
     boolean paySuccessIncrementOrder(String orderSn, String tradeNo, int paymentTypeName);
+
+    IncrementOrder getByOrderSnNoPay(String orderSn);
 }

src/main/java/com/fdkankan/ucenter/service/IOrderService.java

@@ -44,4 +44,6 @@ public interface IOrderService extends IService<Order> {
     OrderVo getOrderDetail(Long orderId);
 
     void autoUpdateOrderStatus();
+
+    Order getByOrderSnNoPay(String orderSn);
 }

src/main/java/com/fdkankan/ucenter/service/IVirtualOrderService.java

@@ -25,4 +25,6 @@ public interface IVirtualOrderService extends IService<VirtualOrder> {
     boolean paySuccessVirtualOrder(String orderSn, String tradeNo, int paymentTypeName);
 
     List<VirtualOrder> getByCameraId(Long cameraId);
+
+    VirtualOrder getByOrderSnNoPay(String orderSn);
 }

src/main/java/com/fdkankan/ucenter/service/impl/DownloadOrderServiceImpl.java

@@ -80,6 +80,17 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     }
 
     @Override
+    public DownloadOrder getByOrderSnNoPay(String orderSn) {
+        QueryWrapper<DownloadOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(DownloadOrder::getOrderSn,orderSn);
+        queryWrapper.lambda().eq(DownloadOrder::getPayStatus,1);
+        List<DownloadOrder> list = this.list(queryWrapper);
+        if(list == null || list.size() <=0){
+            return null;
+        }
+        return list.get(0);    }
+
+    @Override
     public boolean paySuccessDownloadOrder(String orderSn, String tradeNo, int paymentTypeName) {
         LambdaUpdateWrapper<DownloadOrder> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(DownloadOrder::getPayType,paymentTypeName)

src/main/java/com/fdkankan/ucenter/service/impl/ExpansionOrderServiceImpl.java

@@ -60,6 +60,17 @@ public class ExpansionOrderServiceImpl extends ServiceImpl<IExpansionOrderMapper
     }
 
     @Override
+    public ExpansionOrder getByOrderSnNoPay(String orderSn) {
+        QueryWrapper<ExpansionOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ExpansionOrder::getOrderSn,orderSn);
+        queryWrapper.lambda().eq(ExpansionOrder::getPayStatus,1);
+        List<ExpansionOrder> list = this.list(queryWrapper);
+        if(list == null || list.size()<=0){
+            return null;
+        }
+        return list.get(0);    }
+
+    @Override
     public boolean paySuccessExpansionOrder(String orderSn, String tradeNo, int paymentTypeName, int status) {
         LambdaUpdateWrapper<ExpansionOrder> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(ExpansionOrder::getPayType,paymentTypeName)

src/main/java/com/fdkankan/ucenter/service/impl/IncrementOrderServiceImpl.java

@@ -186,6 +186,17 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
     }
 
     @Override
+    public IncrementOrder getByOrderSnNoPay(String orderSn) {
+        QueryWrapper<IncrementOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(IncrementOrder::getOrderSn,orderSn);
+        queryWrapper.lambda().eq(IncrementOrder::getPayStatus,1);
+        List<IncrementOrder> list = this.list(queryWrapper);
+        if(list == null || list.size()<=0){
+            return null;
+        }
+        return list.get(0);    }
+
+    @Override
     public boolean paySuccessIncrementOrder(String orderSn, String tradeNo, int paymentTypeName) {
         LambdaUpdateWrapper<IncrementOrder> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(IncrementOrder::getPayType,paymentTypeName)

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -303,6 +303,13 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     }
 
     @Override
+    public Order getByOrderSnNoPay(String orderSn) {
+        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Order::getOrderSn,orderSn);
+        wrapper.eq(Order::getPaymentStatus, PaymentStatus.paid.name());
+        return this.getOne(wrapper);    }
+
+    @Override
     public DownloadOrder downloadOrder(DownNumParam param) {
         //支付美金，只能paypal支付
         if(param.getAbroad() == 1 && param.getPayType() != 2){

src/main/java/com/fdkankan/ucenter/service/impl/VirtualOrderServiceImpl.java

@@ -55,6 +55,18 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
     }
 
     @Override
+    public VirtualOrder getByOrderSnNoPay(String orderSn) {
+        QueryWrapper<VirtualOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(VirtualOrder::getOrderSn,orderSn);
+        queryWrapper.lambda().eq(VirtualOrder::getPayStatus,1);
+        List<VirtualOrder> list = this.list(queryWrapper);
+        if(list == null || list.size()<=0){
+            return null;
+        }
+        return list.get(0);
+    }
+
+    @Override
     public boolean paySuccessVirtualOrder(String orderSn, String tradeNo, int paymentTypeName) {
         LambdaUpdateWrapper<VirtualOrder> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(VirtualOrder::getPayType,paymentTypeName)