jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
张乐
2020-09-15 18:24:23 +08:00
parent 4b0051076f
commit 877169ca98
11 changed files with 23 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java
View File

@@ -620,8 +620,8 @@ public class OrderServiceImpl implements OrderService {
result.setEvaluatedCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_VERF, currentUser.getUid()).size());
// 已完成
result.setCompleteCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_COMPLETE, currentUser.getUid()).size());
// 退款中
result.setRefundCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_REFUNDING, currentUser.getUid()).size());
// 退款中和已退款
result.setRefundCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_REFUND, currentUser.getUid()).size());
return result;
}

7
crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java
View File

@@ -398,7 +398,7 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductDao, StoreP
// 对attr表做全量更新，删除原有数据保存现有数据
attrService.removeByProductId(storeProduct.getId());
storeProductAttrValueService.removeByProductId(storeProduct.getId());
if(storeProductRequest.getSpecType()) { // todo 确认单属性商品的attr参数
if(storeProductRequest.getSpecType()) {
storeProductRequest.getAttr().forEach(e->{
e.setProductId(storeProductRequest.getId());
e.setAttrValues(StringUtils.strip(e.getAttrValues().replace("\"",""),"[]"));
@@ -421,9 +421,8 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductDao, StoreP
}
spav.setSuk(String.join(",",skuList));
}
// HashMap<String, Object> attrValues = setAttrValueByRequest(storeProductRequest);
spav.setAttrValue(JSON.toJSONString(attrValuesRequest.getAttrValue()));
// spav.setAttrValue(JSON.toJSONString(attrValues));
spav.setAttrValue(JSON.toJSONString(attrValuesRequest.getAttrValue()));
spav.setImage(systemAttachmentService.clearPrefix(spav.getImage()));
storeProductAttrValues.add(spav);
}
boolean saveOrUpdateResult = storeProductAttrValueService.saveOrUpdateBatch(storeProductAttrValues);

5
crmeb/src/main/java/com/zbkj/crmeb/store/utilService/OrderUtils.java
View File

@@ -920,9 +920,10 @@ public class OrderUtils {
queryWrapper.eq(StoreOrder::getPaid, true);
queryWrapper.eq(StoreOrder::getStatus, 2);
break;
case Constants.ORDER_STATUS_H5_REFUND: // 退款
case Constants.ORDER_STATUS_H5_REFUND: // 包含已退款和退款中
queryWrapper.eq(StoreOrder::getPaid, true);
queryWrapper.in(StoreOrder::getRefundStatus, "1,2"); //大于0
queryWrapper.in(StoreOrder::getStatus,-1,-2);
queryWrapper.in(StoreOrder::getRefundStatus, 1,2);
break;
}
queryWrapper.eq(StoreOrder::getIsDel, false);

1
crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
View File

@@ -73,7 +73,6 @@ public class SystemCityServiceImpl extends ServiceImpl<SystemCityDao, SystemCity
lambdaQueryWrapper.in(SystemCity::getIsShow, true);
return dao.selectList(lambdaQueryWrapper);
}
/**
* 修改状态
* @param id integer id

1
crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java
View File

@@ -150,7 +150,6 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigDao, System
//修改之前的数据
updateStatusByFormId(systemFormCheckRequest.getId());
//批量插入
saveBatch(systemConfigList);
//删除之前隐藏的数据