未进行版本管理的文件2025/08/05

chengf

2025-08-06 953784a75298482567418ef3058525f4a115750b

未进行版本管理的文件2025/08/05

 java110-bean/src/main/java/com/java110/dto/room/ApplyRoomDiscountDto.java

@@ -128,7 +128,7 @@
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
        this.startTime = startTime == null ? null : startTime.split(" ")[0];
    }

    public String getEndTime() {
@@ -136,7 +136,7 @@
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
        this.endTime = endTime == null ? null : endTime.split(" ")[0];
    }

    public String getState() {

 java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml

@@ -813,11 +813,11 @@

    <!-- 批量插入费用 -->
    <insert id="insertFees" parameterType="Map">
        insert into pay_fee (amount,status_cd,income_obj_id,fee_type_cd,start_time,end_time,community_id,b_id,fee_id,
        insert into pay_fee (amount,status_cd,income_obj_id,fee_type_cd,secondary_fee_type_cd,start_time,end_time,community_id,b_id,fee_id,
        user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id)
        VALUES
        <foreach collection="payFeePos" item="item" separator=",">
            (#{item.amount},'0',#{item.incomeObjId},#{item.feeTypeCd},#{item.startTime},#{item.endTime},#{item.communityId},
            (#{item.amount},'0',#{item.incomeObjId},#{item.feeTypeCd},#{item.secondaryFeeTypeCd},#{item.startTime},#{item.endTime},#{item.communityId},
            '-1',#{item.feeId},#{item.userId},#{item.payerObjId},#{item.feeFlag},#{item.state},#{item.configId},#{item.payerObjType},#{item.batchId})
        </foreach>
    </insert>

 java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml

@@ -20,7 +20,7 @@
        select
        t.reason,
        t.prime_rate,t.prime_rate primeRate,
        t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,
        t.fee_type_cd,t.fee_type_cd feeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,
        t.pay_time,t.pay_time payTime,
        t.detail_id,t.detail_id detailId,
        t.receivable_amount,t.receivable_amount receivableAmount,
@@ -147,7 +147,7 @@
        select
        t.reason,
        t.prime_rate,t.prime_rate primeRate,
        t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,
        t.fee_type_cd,t.fee_type_cd feeTypeCd,
        t.pay_time,t.pay_time payTime,
        t.detail_id,t.detail_id detailId,
        t.receivable_amount,t.receivable_amount receivableAmount,
@@ -169,7 +169,6 @@
        pf.payer_obj_type payerObjType,
        pfa.value payerObjName
        from return_pay_fee t
        left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
        inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
        left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390012' and pfa.status_cd = '0'
        inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns =

 java110-interface/src/main/java/com/java110/intf/common/ICarInoutInnerServiceSMO.java

@@ -3,6 +3,8 @@
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.machine.CarInoutDto;
import com.java110.po.car.CarInoutPo;
import com.java110.vo.api.carInout.ApiCarInoutDataVo;
import com.java110.vo.api.carInout.ApiCarInoutVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +32,8 @@
     */
    @RequestMapping(value = "/queryCarInouts", method = RequestMethod.POST)
    List<CarInoutDto> queryCarInouts(@RequestBody CarInoutDto carInoutDto);
    @RequestMapping(value = "/queryCarInouts2", method = RequestMethod.POST)
    List<ApiCarInoutDataVo> queryCarInouts2(@RequestBody CarInoutDto carInoutDto);

    /**
     * 查询<p>小区楼</p>总记录数

 service-common/src/main/java/com/java110/common/smo/impl/CarInoutInnerServiceSMOImpl.java

@@ -9,6 +9,8 @@
import com.java110.dto.machine.CarInoutDto;
import com.java110.po.car.CarInoutPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.carInout.ApiCarInoutDataVo;
import com.java110.vo.api.carInout.ApiCarInoutVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -49,6 +51,22 @@
        return carInouts;
    }

    @Override
    public List<ApiCarInoutDataVo> queryCarInouts2(@RequestBody CarInoutDto carInoutDto) {

        //校验是否传了 分页信息

        int page = carInoutDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            carInoutDto.setPage((page - 1) * carInoutDto.getRow());
        }

        List<ApiCarInoutDataVo> carInouts = BeanConvertUtil.covertBeanList(carInoutServiceDaoImpl.getCarInoutInfo(BeanConvertUtil.beanCovertMap(carInoutDto)), ApiCarInoutDataVo.class);


        return carInouts;
    }

    @Override
    public int queryCarInoutsCount(@RequestBody CarInoutDto carInoutDto) {

 service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java

@@ -399,6 +399,7 @@
        businessUnit.put("configId", paramInJson.getString("configId"));
        businessUnit.put("feeTypeCd", paramInJson.getString("feeTypeCd"));
        businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
        businessUnit.put("secondaryFeeTypeCd", paramInJson.getString("secondaryFeeTypeCd"));
        businessUnit.put("amount", "-1.00");
        if (paramInJson.containsKey("amount") && !StringUtil.isEmpty(paramInJson.getString("amount"))) {
            businessUnit.put("amount", paramInJson.getString("amount"));

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java

@@ -274,6 +274,9 @@
            c.add(Calendar.DAY_OF_MONTH, 2);//开始时间，添加1，2天的冗余，只要比5小即可
            applyRoomDiscountDto.setStartTime(simpleDateFormat.format(c.getTime()));//重新设置开始时间
            double month = Double.parseDouble(feeDetailDto.getCycles());
            if(month == 105){
                month = 2;
            }
            c.add(Calendar.MONTH, (int) month);
            c.add(Calendar.DAY_OF_MONTH, -5);//这里根据设置时间荣誉5天
            Date endTime = c.getTime();

 service-job/src/main/java/com/java110/job/cmd/importCarInout/QueryCarInout.java

New file
@@ -0,0 +1,56 @@
package com.java110.job.cmd.importCarInout;

import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.user.UserDownloadFileDto;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.po.car.CarInoutPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.carInout.ApiCarInoutDataVo;
import com.java110.vo.api.carInout.ApiCarInoutVo;
import com.java110.vo.api.parkingArea.ApiParkingAreaVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.text.ParseException;
import java.util.List;

@Java110Cmd(serviceCode = "import.QueryCarInout")
public class QueryCarInout extends Cmd {

    @Autowired
    private ICarInoutInnerServiceSMO iCarInoutInnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {

    }

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException, ParseException {
        CarInoutDto carInoutDto = BeanConvertUtil.covertBean(reqJson, CarInoutDto.class);
        int i = iCarInoutInnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
        if(i > 0){
            carInoutDto.setTotal(i);
            carInoutDto.setRecords((int) Math.ceil((double) i / (double) reqJson.getInteger("row")));
            List<ApiCarInoutDataVo> carInoutDtos = iCarInoutInnerServiceSMOImpl.queryCarInouts2(carInoutDto);

            ApiCarInoutVo carInoutVo = new ApiCarInoutVo();

            carInoutVo.setTotal(i);
            carInoutVo.setRecords((int) Math.ceil((double) i / (double) reqJson.getInteger("row")));
            carInoutVo.setCarInouts(carInoutDtos);

            ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(carInoutVo), HttpStatus.OK);
            cmdDataFlowContext.setResponseEntity(responseEntity);
        }
    }
}

 service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomHistoryFeeDetailQueueDataAdapt.java

@@ -85,6 +85,8 @@
        importFeeDetails(importRoomFees.get(0).getStoreId(), importRoomFees.get(0).getUserId(), importRoomFees, importRoomFees.get(0).getBatchId());




    }

    private void importFeeDetails(String storeId, String userId, List<ImportRoomFee> importRoomFees, String batchId) {

 springboot/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active:  dev
    active:  devlocal

#  docker build -t lx .
#