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

Compare commits

base: backend:015251831597e24c6d503ff73323eb8b94b52d34
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0
..
compare: backend:d1ef71669eb5aa64a88666728af348fdf2173117
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0

No commits in common. "015251831597e24c6d503ff73323eb8b94b52d34" and "d1ef71669eb5aa64a88666728af348fdf2173117" have entirely different histories.
0152518315 ... d1ef71669e

4 changed files with 6 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
client/src/main/java/com/small/client/controller/WebController.java
View File

@ -75,7 +75,7 @@ public class WebController {
//sxDataService.getAppSign();
CommentModel commentModel= sxDataService.getCommentModel();
DataBaseInfo dataBaseInfo=sxDataService.getDataBaseInfo(commentModel);
if(dataBaseInfo==null||StringUtils.isEmpty(dataBaseInfo.getUserName())){
if(dataBaseInfo==null){
log.error("syncGoods dataBaseInfo is null");
return;
}

2
client/src/main/java/com/small/client/dto/DataBaseInfo.java
View File

@ -43,7 +43,7 @@ public class DataBaseInfo {
private String shopGapTime;
@ApiModelProperty(value = "调价时间")
private String priceOperatime;
private String priceOperatiem;
@ApiModelProperty(value = "库存条件")
private String stockOperateWhere;

3
client/src/main/java/com/small/client/dto/ProductQuantityConsumptionDto.java
View File

@ -29,9 +29,6 @@ public class ProductQuantityConsumptionDto {
@ApiModelProperty("数量（正数表示入库/增加，负数表示出库/减少）")
private BigDecimal quantity;
@ApiModelProperty("订单总额")
private BigDecimal saleAmount;
@ApiModelProperty("消费状态：0-未消费，1-已消费")
private Integer status;

11
client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java
View File

@ -350,7 +350,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
String stockOperateWhere=" ls.oper_date>'"+dataBaseInfo.getOperDate()+"' ";
dataBaseInfo.setStockOperateWhere(stockOperateWhere);
}
if(StringUtils.isNotEmpty(dataBaseInfo.getPriceOperatime())){
if(StringUtils.isNotEmpty(dataBaseInfo.getPriceOperatiem())){
where+=" and EXISTS ( " +
" select " +
" shop.item_no " +
@ -362,17 +362,15 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
" where " +
" tppfm.valid_flag = '1' " +//有效
" and shop.item_no=tpfd.item_no " +
" and tppfm.oper_date >'"+dataBaseInfo.getPriceOperatime()+"' " +
" and tppfm.oper_date >'"+dataBaseInfo.getPriceOperatiem()+"' " +
" )";
}
dataBaseInfo.setWhere(where);
// 记录总数
total = sxDataDao.getTBditemInfoJoninTotal(dataBaseInfo);
}else {
where="where b.status='1'";
dataBaseInfo.setWhere(where);
total = sxDataDao.getTBditemInfoTotal(dataBaseInfo);
where="where shop.status='1'";
}
if(total==0){
log.info("暂无商品同步");
@ -489,10 +487,9 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
* 增量同步 调价单变化
*/
private void syncFlowPrice(DataBaseInfo dataBaseInfo, CommentModel commentModel,String sycnTime){
dataBaseInfo.setPriceOperatime(sycnTime);
dataBaseInfo.setPriceOperatiem(sycnTime);
commentModel.setSyncTime("");
dataBaseInfo.setOperDate("");
dataBaseInfo.setStockOperateWhere("");
syncAllGoods(dataBaseInfo,commentModel);
}
@ -795,7 +792,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
if(!productQuantityConsumptionDtoList.isEmpty()){
Map map = productQuantityConsumptionDtoList.stream()
.collect(Collectors.groupingBy(
dto -> dto.getOrderId()+"-"+dto.getProductNumber(),
ProductQuantityConsumptionDto::getProductNumber,
Collectors.reducing(
BigDecimal.ZERO,
ProductQuantityConsumptionDto::getQuantity,