修改

kongdeqiang

2023-07-10 85f5baee0e3d255860395278dcb5cbb5cc766023

 src/main/java/com/boying/controller/phone/TicketController.java

@@ -10,6 +10,7 @@
import com.boying.entity.*;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
import com.boying.util.FileUtil;
import com.boying.util.NumberToCN;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -28,6 +29,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@RestController
@@ -119,6 +123,7 @@
        }

        ticket.setStatus(1);//已处理
        ticket.setPayStatus(0);

        ticketService.saveOrUpdate(ticket);
        if(StringUtils.isBlank(ticket.getQrUrl())){
@@ -166,6 +171,11 @@
    public R getById(@PathVariable("id" ) Integer id) {
        Ticket byId = ticketService.getById(id);
        byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
        String shouQianMing = byId.getShouQianMing();
        if(shouQianMing != null){
            String get = FileUtil.netSourceToBase64(shouQianMing, "GET");
            byId.setShouQianMing(get);
        }
        return R.ok(byId);
    }

@@ -185,7 +195,23 @@
            String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
            ticket.setMoneyStr(s.toString());
        }
        return R.ok(ticketService.updateById(ticket));
        if(StringUtils.isBlank(ticket.getNumber())){
            ticket = ticketService.getNumber(ticket);
            ticket.setPush(0);
            ticketService.uploadInfo(ticket);
        }
        return R.ok();
    }

    //与执法对接
    @GetMapping("/getResult")
    public Object getResult(Ticket ticket){
        if(StringUtils.isNotBlank(ticket.getShouQianMing())){
            ticketService.updateById(ticket);
            return R.ok();
        }else {
            return R.failed("更新失败");
        }
    }

    public void saveLogo(String name,String lng,String lat){
@@ -210,6 +236,7 @@
            tb.setCarType(ticket.getCarType());
            tb.setColor(ticket.getColor());
            tb.setViolationCount(1);
            tb.setIsActive(0);
            ticketBlackService.saveOrUpdate(tb);
        }else {
            TicketBlack ticketBlack = all.get(0);
@@ -341,4 +368,19 @@
            return R.ok("请扫码缴费");
        }
    }

    /**
     * 测试对接
     * @param
     * @return R
     */
    @ApiOperation(value = "测试对接", notes = "测试对接")
    @GetMapping("/test" )
    public R test() {
        Ticket byId = ticketService.getById(13);
        byId = ticketService.getNumber(byId);
        byId.setPush(0);
        ticketService.uploadInfo(byId);
        return R.ok();
    }
}