backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: backend:3c19ee70649d1c27ff475980e5995a269ab6ae8a
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0
..
compare: backend:30bf1446d4d07bbae32c28c575b6102a0dc7949c
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0

No commits in common. "3c19ee70649d1c27ff475980e5995a269ab6ae8a" and "30bf1446d4d07bbae32c28c575b6102a0dc7949c" have entirely different histories.
3c19ee7064 ... 30bf1446d4

2 changed files with 1 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
View File

@ -513,7 +513,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
item.setItem_quantity(item_quantity);
item.setItem_is_default(item_is_default);
item.setItem_unit_sp(BigDecimal.valueOf(0));
item.setItem_barcode(item_number);
item.setItem_purchase_price(item_purchase_price);
item.setItem_purchase_rate(item_purchase_rate);
item.setItem_sales_rate(item_sales_rate);

3
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
View File

@ -864,7 +864,6 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
ProductQuantityConsumption productQuantityConsumption=new ProductQuantityConsumption();
productQuantityConsumption.setConsumeId(consumeId);
productQuantityConsumption.setStatus(1);
productQuantityConsumption.setUpdateTime(new Date());
productQuantityConsumptionList.add(productQuantityConsumption);
}
if(!productQuantityConsumptionList.isEmpty()){
@ -916,8 +915,6 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
productQuantityConsumption.setProductNumber(productNumber);
productQuantityConsumption.setQuantity(Convert.toBigDecimal(v));
productQuantityConsumption.setStoreId(Integer.valueOf(storeId));
productQuantityConsumption.setCreateTime(new Date());
productQuantityConsumption.setUpdateTime(new Date());
productQuantityConsumption.setStatus(0);
productQuantityConsumption.setUnitPrice(new BigDecimal(unitPrice));
productQuantityConsumption.setSaleAmount(new BigDecimal(saleAmount));