加入营销商品功能

wuxw

2022-10-25 873197abd3ae5e447f57683031cea6896f0cf2aa

 service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java

@@ -18,16 +18,19 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
@@ -50,7 +53,7 @@
 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
 */
@Java110Cmd(serviceCode = "carInout.listCarInParkingAreaCmd")
public class ListCarInParkingAreaCmd extends AbstractServiceCmdListener {
public class ListCarInParkingAreaCmd extends Cmd {

    private static Logger logger = LoggerFactory.getLogger(ListCarInParkingAreaCmd.class);

@@ -63,24 +66,36 @@
    @Autowired
    private IComputeFeeSMO computeFeeSMOImpl;

    @Autowired
    private ICarInoutPaymentV1InnerServiceSMO carInoutPaymentV1InnerServiceSMOImpl;


    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
        Assert.hasKeyAndValue(reqJson, "paId", "未包含停车场信息");
        if(reqJson.containsKey("boxId") && !StringUtil.isEmpty(reqJson.getString("boxId"))) {
            Assert.hasKeyAndValue(reqJson, "boxId", "未包含岗亭信息");
        }else{
            Assert.hasKeyAndValue(reqJson, "paId", "未包含停车场信息");
        }
    }

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        CarInoutDto carInoutDto = BeanConvertUtil.covertBean(reqJson, CarInoutDto.class);
        carInoutDto.setStates(new String[]{CarInoutDto.STATE_IN, CarInoutDto.STATE_PAY, CarInoutDto.STATE_REPAY});
        carInoutDto.setPaIds(getPaIds(reqJson));
        if(reqJson.containsKey("boxId")) {
            carInoutDto.setPaIds(getPaIds(reqJson));
        }else{
            carInoutDto.setPaId(reqJson.getString("paId"));
        }
        int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);

        List<CarInoutDto> carInoutDtos = null;

        if (count > 0) {
            carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(carInoutDto);
            freshPayTime(carInoutDtos);
            carInoutDtos = computeCarInouts(carInoutDtos);
        } else {
            carInoutDtos = new ArrayList<>();
@@ -93,6 +108,31 @@
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }

    /**
     * 输入最新的支付时间
     * @param carInoutDtos
     */
    private void freshPayTime(List<CarInoutDto> carInoutDtos) {
        for(CarInoutDto carInoutDto : carInoutDtos){
            if(CarInoutDto.STATE_PAY.equals(carInoutDto.getState()) || CarInoutDto.STATE_REPAY.equals(carInoutDto.getState())){

                //查询 支付记录 刷新payTime
                CarInoutPaymentDto carInoutPaymentDto = new CarInoutPaymentDto();
                carInoutPaymentDto.setInoutId(carInoutDto.getInoutId());
                carInoutPaymentDto.setPage(1);
                carInoutPaymentDto.setRow(1);
               List<CarInoutPaymentDto> carInoutPaymentDtos =  carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPayments(carInoutPaymentDto);

               if(carInoutPaymentDtos == null || carInoutPaymentDtos.size() < 1){
                   carInoutDto.setPayTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
                   continue;
               }

               carInoutDto.setPayTime(carInoutPaymentDtos.get(0).getPayTime());
            }
        }
    }

    private String[] getPaIds(JSONObject reqJson) {
        if (reqJson.containsKey("boxId") && !StringUtil.isEmpty(reqJson.getString("boxId"))) {
            ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();