From 5afec37b365eec6b9322cf3e2807acecd55f4a4c Mon Sep 17 00:00:00 2001
From: "1304317391@qq.com" <ainiaini1314>
Date: Thu, 24 Nov 2022 18:22:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BA=93=E5=AD=98=E4=B8=BA0,?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-local.yaml      |  2 +-
 .../impl/YxStoreCombinationServiceImpl.java        |  2 +-
 .../service/impl/YxStoreSeckillServiceImpl.java    |  2 +-
 .../service/impl/YxStoreOrderServiceImpl.java      | 14 ++++++++++----
 .../modules/product/domain/YxStoreProduct.java     |  2 +-
 .../service/impl/YxStoreProductServiceImpl.java    |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 13d25873..dd16b8ee 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -270,7 +270,7 @@ dubbo:
 bxg:
   shop:
 #    API_URL: http://192.168.10.113:48080/bxgApp
-    API_URL:  http://16a9b0c.r5.cpolar.top
+    API_URL:  http://5205b509.r5.cpolar.top
     SITE_URL: http://192.168.10.113:48080/bxgApp
     UNI_SITE_URL: http://192.168.10.113:48080/bxgApp
     ADMIN_API_URL: http://192.168.10.113:48080/bxg
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
index b8538040..b4e05f5f 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
@@ -391,7 +391,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
                 .reduce(Integer::sum)
                 .orElse(0);
 
-        if(stock <= 0) {
+        if(stock < 0) {
             throw new YshopException("活动库存不能低于0");
         }
 
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
index d7211b1c..0c79ecaa 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
@@ -447,7 +447,7 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
                 .reduce(Integer::sum)
                 .orElse(0);
 
-        if(stock <= 0) {
+        if(stock < 0) {
             throw new YshopException("库存不能低于0");
         }
 
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index c6aca4e5..ae8865cd 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -1204,9 +1204,11 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
                 break;
             //待发货
             case STATUS_1:
+                Integer[] integerss = {OrderInfoEnum.STATUS_0.getValue(),OrderInfoEnum.STATUS_5.getValue()};
                 wrapper.eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
                         .eq(YxStoreOrder::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
-                        .between(YxStoreOrder::getStatus, OrderInfoEnum.STATUS_0.getValue(),OrderInfoEnum.STATUS_5.getValue()); //待审核/代发货都为代发货
+                        .in(YxStoreOrder::getStatus,Arrays.asList(integerss));//待审核/代发货都为代发货
+//                        .between(YxStoreOrder::getStatus, OrderInfoEnum.STATUS_0.getValue(),OrderInfoEnum.STATUS_5.getValue());
                 break;
             //待收货
             case STATUS_2:
@@ -1418,9 +1420,12 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         if (uid != null) {
             wrapperThree.eq(YxStoreOrder::getUid, uid);
         }
+        Integer[] integers={OrderInfoEnum.STATUS_0.getValue(),OrderInfoEnum.STATUS_5.getValue()};
         wrapperThree.eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
                 .eq(YxStoreOrder::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
-                .between(YxStoreOrder::getStatus, OrderInfoEnum.STATUS_0.getValue(),OrderInfoEnum.STATUS_5.getValue());
+                .eq(YxStoreOrder::getUserDel,0) //用户未删除
+                .in(YxStoreOrder::getStatus,Arrays.asList(integers));//待审核/代发货都为代发货
+//                .between(YxStoreOrder::getStatus, OrderInfoEnum.STATUS_0.getValue(),OrderInfoEnum.STATUS_5.getValue());
 //                .eq(YxStoreOrder::getStatus, OrderInfoEnum.STATUS_0.getValue());
         Long unshippedCount = yxStoreOrderMapper.selectCount(wrapperThree);
 
@@ -1459,10 +1464,11 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         if (uid != null) {
             wrapperSeven.eq(YxStoreOrder::getUid, uid);
         }
-        String[] strArr = {"0", "1"};
+//        String[] strArr = {"0", "1"};
         wrapperSeven.eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
                 .eq(YxStoreOrder::getCombinationId,0)
-                .in(YxStoreOrder::getRefundStatus, Arrays.asList(strArr));
+                .eq(YxStoreOrder::getRefundStatus,1);
+//                .in(YxStoreOrder::getRefundStatus, Arrays.asList(strArr));
         Long refundCount = yxStoreOrderMapper.selectCount(wrapperSeven);
 
 
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
index 7af75435..9596de64 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
@@ -148,7 +148,7 @@ public class YxStoreProduct extends BaseDomain {
     /** 库存 */
     @ApiModelProperty(value = "库存")
     @NotNull(message = "请输入库存")
-    @Min(message = "库存不能小于0",value = 1)
+    @Min(message = "库存不能小于0",value = 0)
     private Integer stock;
 
 
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
index 0167fbc1..2a0fa0ce 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
@@ -838,7 +838,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
                 .reduce(Integer::sum)
                 .orElse(0);
 
-        if (stock <= 0) {
+        if (stock < 0) {
             throw new YshopException("库存不能低于0");
         }