czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增规格逻辑修改，新增激活码到期时间，激活码时间校验

Browse Source
This commit is contained in:
liuyingfang
2024-03-07 09:00:14 +08:00
parent 45d9319811
commit 55ca50ad1b
8 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
View File

@@ -85,7 +85,7 @@ public class TbProductServiceImpl implements TbProductService {
//记录单位id
if (product.getUnitId() != null){
if (!"".equals(product.getUnitId())){
unitId.add(Integer.valueOf(product.getUnitId().trim()));
unitId.add(product.getUnitId());
}
}
//记录规格id
@@ -241,7 +241,7 @@ public class TbProductServiceImpl implements TbProductService {
ListUtil.JSONArrayChangeString(resources.getGroupSnap());
}
if (resources.getUnitId() != null){
product.setUnitId(String.valueOf(resources.getUnitId()));
product.setUnitId(resources.getUnitId());
}
//套餐内容
if (!resources.getGroupSnap().isEmpty()){
@@ -290,7 +290,7 @@ public class TbProductServiceImpl implements TbProductService {
product.setStatus(1);
product.setUpdatedAt(Instant.now().toEpochMilli());
product.setCategoryId(resources.getCategoryId().toString());
product.setImages(resources.getImages().toString());
if (!resources.getGroupSnap().isEmpty()){
ListUtil.JSONArrayChangeString(resources.getGroupSnap());
}
@@ -311,6 +311,15 @@ public class TbProductServiceImpl implements TbProductService {
tbProductSkuRepository.saveAll(skuList);
}
//保存到sku_result
if ("sku".equals(resources.getTypeEnum())){
TbProductSkuResult productSkuResult = new TbProductSkuResult();
productSkuResult.setCreatedAt(Instant.now().toEpochMilli());
productSkuResult.setUpdatedAt(Instant.now().toEpochMilli());
productSkuResult.setTagSnap(resources.getSkuSnap());
productSkuResult.setId(save.getId());
tbProductSkuResultRepository.save(productSkuResult);
}
}
@Override

1
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
View File

@@ -132,6 +132,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
BeanUtils.copyProperties(resources,tbShopInfo);
tbShopInfo.setCreatedAt(Instant.now().toEpochMilli());
tbShopInfo.setUpdatedAt(Instant.now().toEpochMilli());
tbShopInfo.setOnSale(1);
//激活码
TbMerchantRegister tbMerchantRegister = new TbMerchantRegister();
if (resources.getRegisterCode() != null){