sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

支持库存为0,修复我的页面展示

Browse Source
This commit is contained in:
1304317391@qq.com
2022-11-24 18:22:33 +08:00
parent 7f0a0a43a8
commit 5afec37b36
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
+1 -1
View File
@@ -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");
}
zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
+1 -1
View File
@@ -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");
}
zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+10 -4
View File
@@ -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);
zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
+1 -1
View File
@@ -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;
zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+1 -1
View File
@@ -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");
}