Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

1 天以前 3e68e7c7999fd3d976389ffe6d9650dd0906c98f

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java

@@ -6,6 +6,7 @@
import com.dy.pipIrrGlobal.voSe.VoTermActiveCard;
import com.dy.pipIrrGlobal.voSe.VoTermRecharge;
import com.dy.pipIrrTerminal.card.dto.ActiveCard;
import com.dy.pipIrrTerminal.card.dto.DtoLoss;
import com.dy.pipIrrTerminal.card.dto.DtoRecharge;
import com.dy.pipIrrTerminal.card.dto.DtoReissue;
import jakarta.validation.Valid;
@@ -78,6 +79,27 @@
    }

    /**
     * 挂失
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "termReportLoss", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop()
    public BaseResponse<Boolean> termReportLoss(@RequestBody @Valid DtoLoss po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Map map_result = cardSv.reportLoss(po);
        if(map_result.get("success").equals(false)) {
            return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
        }
        return BaseResponseUtils.buildSuccess(map_result.get("content")) ;

    }

    /**
     * 补卡
     * @param po
     * @param bindingResult

 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java

@@ -1,5 +1,6 @@
package com.dy.pipIrrTerminal.card;

import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
@@ -10,10 +11,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory;
import com.dy.pipIrrGlobal.voSe.VoTermActiveCard;
import com.dy.pipIrrGlobal.voSe.VoTermRecharge;
import com.dy.pipIrrTerminal.card.dto.ActiveCard;
import com.dy.pipIrrTerminal.card.dto.CardSimple;
import com.dy.pipIrrTerminal.card.dto.DtoRecharge;
import com.dy.pipIrrTerminal.card.dto.DtoReissue;
import com.dy.pipIrrTerminal.card.dto.*;
import com.dy.pipIrrTerminal.card.enums.CardStateENUM;
import com.dy.pipIrrTerminal.card.enums.LastOperateENUM;
import com.dy.pipIrrTerminal.card.enums.OperateTypeENUM;
@@ -95,6 +93,41 @@
        }

        map.put("success", true);
        return map;
    }

    /**
     * 根据水卡编号判断该卡是否可以挂失
     * @param po
     * @return true:可以报失
     */
    public Map canReportLoss(DtoLoss po) {
        Map map = new HashMap<>();
        map.put("success", false);
        map.put("content", null);

        Long cardNum = po.getCardNum();
        String stateName = seClientCardMapper.getCardStateByCardNum(cardNum);
        if(stateName == null || stateName.equals("") || !stateName.equals("正常")) {
            map.put("msg", stateName + ", " + "水卡状态不支持当前操作");
            return map;
        }

        /**
         * 依据水卡编号获取水卡表主键及农户编号
         */
        Map map_card = Optional.ofNullable(seClientCardMapper.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
        if (map_card == null || map_card.size() <= 0) {
            map.put("msg", "卡号错误，该卡不存在");
            return map;
        }
        CardSimple card = new CardSimple();
        card.setCardId(Long.parseLong(map_card.get("cardId").toString()));
        card.setClientId(Long.parseLong(map_card.get("clientId").toString()));
        //card.setProtocol(map_card.get("protocol").toString());

        map.put("success", true);
        map.put("content", card);
        return map;
    }

@@ -198,6 +231,7 @@
        return dtf.format(dateTime) + sb.toString();
    }

    @Transactional(rollbackFor = Exception.class)
    public Map addCardAndOperate(ActiveCard po, Long cardNum, String orderNo) {
        Map map = new HashMap<>();
        map.put("success", false);
@@ -266,6 +300,7 @@
     * @param cardNum
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public Map plusRecharge(ActiveCard po, Long cardNum) {
        Map map = new HashMap<>();
        map.put("success", false);
@@ -480,4 +515,92 @@
        map.put("content", voTermActiveCard);
        return map;
    }

    @Transactional(rollbackFor = Exception.class)
    public Map reportLoss(DtoLoss po) {
        Map map = new HashMap<>();
        map.put("success", false);
        map.put("content", null);

        Map map_canReportLoss = canReportLoss(po);
        if(map_canReportLoss.get("success").equals(false)) {
            map.put("msg", map_canReportLoss.get("msg").toString());
            return map;
        }
        CardSimple card = (CardSimple) map_canReportLoss.get("content");
        Long cardId = card.getCardId();
        Long clientId = card.getClientId();

        Float money = Optional.ofNullable(po.getMoney()).orElse(0f);
        Float refund = Optional.ofNullable(po.getRefund()).orElse(0f);

        SeClientCard seClientCard = new SeClientCard();
        seClientCard.setId(cardId);
        seClientCard.setMoney(money);
        seClientCard.setLossdtdt(new Date());
        seClientCard.setState(CardStateENUM.LOSS.getCode());
        seClientCard.setLastoper(LastOperateENUM.LOSS.getCode());
        Integer rec_updateClientCard = Optional.ofNullable(seClientCardMapper.updateByPrimaryKeySelective(seClientCard)).orElse(0);
        if (rec_updateClientCard == 0) {
            map.put("msg", "挂失失败-农户卡修改异常");
            return map;
        }

        SeCardOperate seCardOperate = new SeCardOperate();
        seCardOperate.setCardId(cardId);
        seCardOperate.setClientId(clientId);
        seCardOperate.setMoney(money);
        seCardOperate.setTradeAmount(-refund);
        seCardOperate.setPaymentId(1L);
        seCardOperate.setOperateType(OperateTypeENUM.LOSS.getCode());
        seCardOperate.setRemarks(po.getRemarks());
        seCardOperate.setOperator(po.getOperator());
        seCardOperate.setOperateDt(new Date());
        seCardOperate.setOperateValid((byte) 2);
        seCardOperateMapper.insert(seCardOperate);
        if (seCardOperate.getId() == 0) {
            map.put("msg", "挂失失败-挂失记录写入异常");
            return map;
        }

        map.put("success", true);
        map.put("msg", "操作成功");
        return map;
    }

    @Transactional(rollbackFor = Exception.class)
    public Map callBack(DtoCallBack po) {
        Map map = new HashMap<>();
        map.put("success", false);
        map.put("content", null);

        String cardAddr = po.getCardAddr();
        Integer operateType = po.getOperateType();
        String orderNumber = po.getOrderNumber();

        Long cardId = seClientCardMapper.getCardIdByAddr(cardAddr);
        if (cardId == null || cardId.equals(0)) {
            map.put("msg", "您指定的水卡不存在");
            return map;
        }

        if(operateType == 1) {
            /**
             * 开卡操作执行通知
             *  1.依据水卡地址、订单号将无效状态的操作记录改为有效
             *  2.依据水卡ID将无效状态的水卡记录改为有效
             *  3.如果开卡同步充值
             *      修改充值操作记录为有效
             *      修改充值历史记录为有效
             *      修改水卡表的操作信息
             */

        }



        map.put("success", true);
        map.put("msg", "操作成功");
        return map;
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoCallBack.java

New file
@@ -0,0 +1,39 @@
package com.dy.pipIrrTerminal.card.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;

/**
 * @author ZhuBaoMin
 * @date 2025-06-05 10:48
 * @LastEditTime 2025-06-05 10:48
 * @Description 回调传输对象
 */

@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class DtoCallBack {
    public static final long serialVersionUID = 202506051049001L;

    /**
     * 水卡地址
     */
    @NotBlank(message = "水卡地址不能为空")
    private String cardAddr;

    /**
     * 订单编号
     */
    @NotBlank(message = "订单编号不能为空")
    private String orderNumber;

    /**
     * 操作类型：1-开卡，2-充值，3-销卡，4-补卡，5-补扣
     */
    @NotNull(message = "操作类型不能为空")
    private Integer operateType;
}

 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoLoss.java

New file
@@ -0,0 +1,48 @@
package com.dy.pipIrrTerminal.card.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;

/**
 * @author ZhuBaoMin
 * @date 2025-06-05 8:46
 * @LastEditTime 2025-06-05 8:46
 * @Description 挂失传输对象
 */

@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class DtoLoss {
    public static final long serialVersionUID = 202506050848001L;

    /**
     * 要挂失的水卡编号
     */
    @NotNull(message = "水卡编号不能为空")
    private Long cardNum;

    /**
     * 余额
     */
    private Float money;

    /**
     * 退款金额
     */
    private Float refund;

    /**
     * 备注信息
     */
    private String remarks;

    /**
     * 操作人编号
     */
    @NotNull(message = "操作人不能为空")
    private Long operator;
}

 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoReissue.java

@@ -9,7 +9,7 @@
 * @author ZhuBaoMin
 * @date 2025-06-04 14:42
 * @LastEditTime 2025-06-04 14:42
 * @Description 补卡传入对象
 * @Description 补卡传输对象
 */

@Data