Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -28,7 +28,6 @@ import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -297,7 +296,7 @@ public class OrderCancelComponent implements InitializingBean {
             rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
             rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
         } else {
-            if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
+            if (Objects.equals(orderGoods.getVehicleUsage(),VehicleUsageEnum.Status.OWN.getCode())) {
                 if(isSub && weight.compareTo(orderInfo.getOwnResidueCarryWeight()) > 0 ){
                     log.warn("货单用车需求: {},订单号：{},货单号：{},自有剩余吨数:{},需要扣减吨数:{},不足扣减",
                             TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getMsg(),orderNo,orderGoods.getOrderGoodsNo(),

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

@@ -45,13 +45,13 @@ public class OrderGoodsDtsListener {
             OrderGoods after = DtsMapConvertUtil.convert(dataTransportDTO.getAfterMap(), new OrderGoods());
             if(Objects.equals(DtsOperationTypeEnum.INSERT.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //同步after数据
-                log.info("新增:{}",after);
+                log.info("新增:{}",JSON.toJSONString(after));
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
-                log.info("修改:{}",after);
+                log.info("修改:{}",JSON.toJSONString(after));
                 backFillOrderWeight(after);
             }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //数据删除
-                log.info("删除:{}",before);
+                log.info("删除:{}",JSON.toJSONString(before));
             }
         } catch (Exception e) {
             log.info("DTS消息同步失败, database:clx_performance.order_goods, error:{}", e.getMessage());

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -93,8 +93,9 @@ public class OwnerRunningWaterRecordSqlProvider {
                     " a.owner_user_name,a.running_water_no, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
                     " a.account_balance,a.usable_balance,a.take_out_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("owner_running_water_record a");
-            //WHERE("a.owner_user_no = #{param.userNo}");
-
+            if (ObjectUtil.isNotNull(param.getUserNo())) {
+                WHERE("a.owner_user_no = #{param.userNo}");
+            }
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");
             }