2024-07-16 朱宝民

Administrator

2024-07-16 8bcb47b7ea268061f4629e0953de4e3597fca690

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java

@@ -8,11 +8,11 @@
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.pojoSe.SeLoss;
import com.dy.pipIrrGlobal.voSe.VoLoss;
import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
import com.dy.pipIrrSell.result.SellResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -53,9 +53,9 @@
                            schema = @Schema(implementation = VoLoss.class))}
            )
    })
    @GetMapping(path = "/getLosses", consumes = MediaType.APPLICATION_JSON_VALUE)
    @GetMapping(path = "/getLosses")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(@RequestBody @Parameter(description = "查询form表单json数据", required = true) QueryVo vo){
    public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(QueryVo vo){
        try {
            QueryResultVo<List<VoLoss>> res = lossSv.getLosses(vo);
            return BaseResponseUtils.buildSuccess(res);
@@ -77,15 +77,15 @@
    @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid DtoLoss po, @Parameter(hidden = true) BindingResult bindingResult){
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoLoss po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        /**
         * cardId           水卡编号（非传入参数，由cardNum反查）
         * clientId         农户编号（非传入参数，由cardNum反查）
         * cardNum          水卡编号
         * clientNum        农户编号（非传入参数，由cardNum反查，添加挂失使用）
         * money            余额
         * refund           退款金额
         * remarks          备注
@@ -93,8 +93,8 @@
         * lossTime         挂失时间
         */
        Long cardId = 0L;
        String cardNum = po.getCardNum();
        String clientNum = "";
        Long cardNum = po.getCardNum();
        Long clientId = 0L;
        Float money = po.getMoney();
        Float refund = po.getRefund();
        String remarks = po.getRemarks();
@@ -109,7 +109,7 @@
            return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
        }
        cardId = Long.parseLong(map.get("cardId").toString());
        clientNum = map.get("clientNum").toString();
        clientId = Long.parseLong(map.get("clientId").toString());

        /**
         * 修改农户卡信息：
@@ -118,7 +118,9 @@
         */
        SeClientCard seClientCard = new SeClientCard();
        seClientCard.setId(cardId);
        seClientCard.setMoney(money);
        seClientCard.setLossdtdt(lossTime);
        seClientCard.setState(CardStateENUM.LOSS.getCode());
        seClientCard.setLastoper(LastOperateENUM.LOSS.getCode());
        Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
        if(rec_updateClientCard == 0) {
@@ -129,8 +131,10 @@
         * 添加挂失记录
         */
        SeLoss seLoss = new SeLoss();
        seLoss.setCardnum(cardNum);
        seLoss.setClientnum(clientNum);
        //seLoss.setCardnum(cardNum);
        //seLoss.setClientnum(clientNum);
        seLoss.setCardid(cardId);
        seLoss.setClientid(clientId);
        seLoss.setMoney(money);
        seLoss.setRefund(refund);
        seLoss.setRemarks(remarks);