更新逻辑修改

client/src/main/java/com/small/client/controller/WebController.java

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

client/src/main/java/com/small/client/dto/DataBaseInfo.java

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

client/src/main/java/com/small/client/dto/ProductQuantityConsumptionDto.java

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

client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java

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