开卡附加充值、充值、补卡

zhubaomin

4 天以前 41601a43ab9d3d2b65aad02b33c8d57dba7da055

开卡附加充值、充值、补卡

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTermActiveCard.java

New file
@@ -0,0 +1,36 @@
package com.dy.pipIrrGlobal.voSe;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import java.util.Date;

/**
 * @author ZhuBaoMin
 * @date 2025-06-04 11:45
 * @LastEditTime 2025-06-04 11:45
 * @Description 充值机开卡返回视图对象
 */

@Data
@JsonPropertyOrder({"projectNo", "cardNum", "balance", "waterPrice",  "time", "orderNo"})
public class VoTermActiveCard {
    public static final long serialVersionUID = 202506041146001L;

    private Integer projectNo;

    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long cardNum;

    private Float balance;

    private Double waterPrice;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date time;

    private String orderNo;
}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTermRecharge.java

@@ -12,11 +12,11 @@
 * @author ZhuBaoMin
 * @date 2025-05-08 15:59
 * @LastEditTime 2025-05-08 15:59
 * @Description
 * @Description 充值机充值返回视图对象
 */

@Data
@JsonPropertyOrder({"projectNo", "cardNum", "balance", "waterPrice",  "time", "orderNo"})
@JsonPropertyOrder({"projectNo", "cardNum", "orderNo"})
public class VoTermRecharge {
    public static final long serialVersionUID = 202505081559001L;

@@ -24,13 +24,6 @@

    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long cardNum;

    private Float balance;

    private Double waterPrice;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date time;

    private String orderNo;
}

 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml

@@ -85,7 +85,7 @@

pipIrr:
    global:
        dev: false  #是否开发阶段，true或false
        dev: true  #是否开发阶段，true或false
        dsName: ym  #开发阶段，设置临时的数据库名称
    nginx:
        root: D:/apps/pipIrr/nginx-1.27.0

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

@@ -3,14 +3,15 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.voSe.VoTermActiveCard;
import com.dy.pipIrrGlobal.voSe.VoTermRecharge;
import com.dy.pipIrrTerminal.card.dto.ActiveCard;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.dy.pipIrrTerminal.card.dto.DtoRecharge;
import com.dy.pipIrrTerminal.card.dto.DtoReissue;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,10 +35,15 @@
public class CardCtrl {
    private final CardSv cardSv;

    @PostMapping(path = "activeTermCard", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    /**
     * 开卡（含充值）
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "termActiveCard", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop()
    public BaseResponse<VoTermRecharge> activeTermCard(@RequestBody @Valid ActiveCard po, BindingResult bindingResult) {
    public BaseResponse<VoTermActiveCard> termActiveCard(@RequestBody @Valid ActiveCard po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -49,4 +55,46 @@
        return BaseResponseUtils.buildSuccess(map_result.get("content")) ;

    }

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

        Map map_result = cardSv.addRecharge(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
     * @return
     */
    @PostMapping(path = "termReissue", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop()
    public BaseResponse<VoTermRecharge> termReissue(@RequestBody @Valid DtoReissue po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

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

    }
}

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

@@ -1,17 +1,19 @@
package com.dy.pipIrrTerminal.card;

import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
import com.dy.pipIrrGlobal.daoSe.SeRechargeHistoryMapper;
import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
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.enums.CardStateENUM;
import com.dy.pipIrrTerminal.card.enums.LastOperateENUM;
import com.dy.pipIrrTerminal.card.enums.OperateTypeENUM;
@@ -20,6 +22,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -47,6 +50,9 @@
    @Autowired
    private PrWaterPriceMapper prWaterPriceMapper;

    @Autowired
    private SeRechargeHistoryMapper seRechargeHistoryMapper;

    @Value("${project.projectNo}")
    private Integer projectNo;

@@ -69,6 +75,70 @@
        }

        return false;
    }

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

        String stateName = Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(po.getCardNum())).orElse("");
        // 单独充值时卡片必须为正常
        if((po.getRechargeType() == RechargeTypeENUM.RECHARGE.getCode()) && !stateName.equals("正常")) {
            map.put("msg", stateName + ", " + "水卡状态不支持当前操作");
            return map;
        }

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

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

        Long cardNum = po.getCardNum();
        Integer lostCount = seClientCardMapper.getLostCount(cardNum);
        Integer replacedCount = seClientCardMapper.getReplacedCount(cardNum);
        if(lostCount == 0 || replacedCount > 0) {
            map.put("msg", "水卡未挂失或已补卡，不能补卡");
            return map;
        }

        Float reissueAmount = po.getReissueAmount();
        if (reissueAmount != null && reissueAmount > 0) {
            Double tradeAmount = seCardOperateMapper.getTradeAmountByCardNo(cardNum);
            if (tradeAmount != null && tradeAmount > 0) {
                map.put("msg", "原卡挂失时已退款，补卡时不能补费用");
                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;
    }

    /**
@@ -127,7 +197,6 @@
        }
        return dtf.format(dateTime) + sb.toString();
    }


    public Map addCardAndOperate(ActiveCard po, Long cardNum, String orderNo) {
        Map map = new HashMap<>();
@@ -191,11 +260,20 @@
        return map;
    }

    /**
     * 开卡附加充值
     * @param po
     * @param cardNum
     * @return
     */
    public Map plusRecharge(ActiveCard po, Long cardNum) {
        Map map = new HashMap<>();
        map.put("success", false);
        map.put("content", null);

        /**
         * 添加水卡操作记录
         */
        DtoRecharge dtoRecharge = new DtoRecharge();
        dtoRecharge.setCardNum(cardNum);
        dtoRecharge.setAmount(po.getAmount());
@@ -205,17 +283,21 @@
        dtoRecharge.setMoney(0f);
        dtoRecharge.setGift(0f);
        dtoRecharge.setPrice(0f);
        //BaseResponse<Boolean> job = cardOperateSv.addRecharge(dtoRecharge);
        BaseResponse<Boolean> job = null;
        if (!job.getCode().equals("0001")) {
        Map map_plusRecharge = addRecharge(dtoRecharge);
        if (!map_plusRecharge.get("success").equals(true)) {
            map.put("msg", "开卡失败-充值异常");
            return map;
        }

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

    /**
     * 激活或补卡
     * @param po
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public Map activeOrReissueTermCard(ActiveCard po) {
        Map map = new HashMap<>();
        map.put("success", false);
@@ -253,68 +335,30 @@
        Float balance = Optional.ofNullable(seClientCardMapper.getMoneyByCardNum(cardNum)).orElse(0f);
        Double waterPrice = prWaterPriceMapper.getPrice();

        VoTermRecharge voTermRecharge = new VoTermRecharge();
        voTermRecharge.setProjectNo(projectNo);
        voTermRecharge.setCardNum(cardNum);
        voTermRecharge.setBalance(balance);
        voTermRecharge.setWaterPrice(waterPrice);
        voTermRecharge.setTime(new Date());
        voTermRecharge.setOrderNo(orderNo);
        VoTermActiveCard voTermActiveCard = new VoTermActiveCard();
        voTermActiveCard.setProjectNo(projectNo);
        voTermActiveCard.setCardNum(cardNum);
        voTermActiveCard.setBalance(balance);
        voTermActiveCard.setWaterPrice(waterPrice);
        voTermActiveCard.setTime(new Date());
        voTermActiveCard.setOrderNo(orderNo);

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

    public Map canRecharge(DtoRecharge po) {
        Map map = new HashMap<>();
        map.put("success", false);
        map.put("content", null);

        String stateName = Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(po.getCardNum())).orElse("");
        // 单独充值时卡片必须为正常
        if((po.getRechargeType() == RechargeTypeENUM.RECHARGE.getCode()) && !stateName.equals("正常")) {
            map.put("msg", stateName + ", " + "水卡状态不支持当前操作");
            return map;
        }

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

    /**
     * 充值
     * @param po
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public Map addRecharge(DtoRecharge po) {
        Map map = new HashMap<>();
        map.put("success", false);
        map.put("content", null);

        /**
         * cardId           水卡编号（依据水卡编号获取）
         * clientId         农户编号（依据水卡编号获取）
         * cardNum          水卡编号
         * money            卡片余额
         * amount           充值金额
         * gift             赠送金额
         * afterRecharge    充值后余额
         * paymentId        支付方式编号
         * price            水价
         * remarks          备注
         * operator         操作人编号
         * rechargeTime     充值时间
         */

        //Long cardId = 0L;
        //Long clientId = 0L;
        //Long cardNum = po.getCardNum();
        //Float money = po.getMoney();
        //Float amount = po.getAmount();
        //Float gift = po.getGift();
        //Float afterRecharge = money + amount + gift;
        //Long paymentId = po.getPaymentId();
        //Float price = po.getPrice();
        //String remarks = po.getRemarks();
        //Long operator = po.getOperator();
        //Date rechargeTime = new Date();

        Map map_canRecharge = canRecharge(po);
        if(map_canRecharge.get("success").equals(false)) {
@@ -332,6 +376,7 @@
        }
        Long cardId = Long.parseLong(map_cardAndClient.get("cardId").toString());
        Long clientId = Long.parseLong(map_cardAndClient.get("clientId").toString());
        String orderNo = generateOrderNo();

        /**
         * 添加水卡充值操作记录
@@ -348,11 +393,13 @@
        seCardOperate.setRemarks(po.getRemarks());
        seCardOperate.setOperator(po.getOperator());
        seCardOperate.setOperateDt(new Date());
        seCardOperate.setOrderNo(orderNo);
        seCardOperate.setOperateValid((byte) 1);
        seCardOperateMapper.insert(seCardOperate);
        Long rec = Optional.ofNullable(seCardOperate.getId()).orElse(0L);
        if (rec == 0) {
            //return BaseResponseUtils.buildErrorMsg("充值失败-充值记录写入异常");
            map.put("msg", "充值失败-充值记录写入异常");
            return map;
        }

        /**
@@ -372,19 +419,65 @@
        seRechargeHistory.setOperator(po.getOperator());
        seRechargeHistory.setOperatedt(new Date());
        seRechargeHistory.setOperateValid((byte) 1);
        //seRechargeHistoryMapper.insert(seRechargeHistory);
        seRechargeHistoryMapper.insert(seRechargeHistory);
        Long rec_seRechargeHistory = Optional.ofNullable(seRechargeHistory.getId()).orElse(0L);
        //if (rec_seRechargeHistory == 0) {
        //    return BaseResponseUtils.buildErrorMsg("充值失败-充值历史记录写入异常");
        //}
        if (rec_seRechargeHistory == 0) {
            map.put("msg", "充值失败-充值历史记录写入异常");
            return map;
        }

        //Map map_response = new HashMap();
        //map_response.put("projectNo", String.format("%02x", projectNo));
        //map_response.put("orderNumber", rec);
        //map_response.put("cardNum", cardNum);
        //return BaseResponseUtils.buildSuccess(map_response);
        VoTermRecharge voTermRecharge = new VoTermRecharge();
        voTermRecharge.setProjectNo(projectNo);
        voTermRecharge.setCardNum(po.getCardNum());
        voTermRecharge.setOrderNo(orderNo);

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

    /**
     * 补卡
     * @param po
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public Map reissue(DtoReissue po) {
        Map map = new HashMap<>();
        map.put("success", false);
        map.put("content", null);

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

        /**
         * 添加开卡记录，退还金额冲到新卡中
         */
        ActiveCard activeCard = new ActiveCard();
        activeCard.setProtocol(protocol);
        activeCard.setCardAddr(po.getCardAddr());
        activeCard.setClientId(clientId);
        activeCard.setOriginalCardId(cardId);
        activeCard.setCardCost(po.getCardCost());
        activeCard.setAmount(po.getReissueAmount());
        activeCard.setPaymentId(po.getPaymentId());
        activeCard.setRemarks(po.getRemarks());
        activeCard.setOperator(po.getOperator());

        Map map_newCard = activeOrReissueTermCard(activeCard);
        VoTermActiveCard voTermActiveCard = (VoTermActiveCard) map_newCard.get("content");

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

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

@@ -66,4 +66,5 @@
     */
    @NotNull(message = "操作人不能为空")
    private Long operator;

}

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

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

import lombok.Data;

/**
 * @author ZhuBaoMin
 * @date 2025-06-04 16:26
 * @LastEditTime 2025-06-04 16:26
 * @Description 水卡简单信息
 */

@Data
public class CardSimple {
    public static final long serialVersionUID = 202506041628001L;

    /**
     * 水卡ID
     */
    private Long cardId;

    /**
     * 农户ID
     */
    private Long clientId;

    /**
     * 协议名称
     */
    private String protocol;
}

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

@@ -74,5 +74,6 @@
    /**
     * 充值类型：1-开卡同步充值，2-充值
     */
    @NotNull(message = "充值类型不能为空")
    private Byte rechargeType;
}

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

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

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

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

@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class DtoReissue {
    public static final long serialVersionUID = 202506041446001L;
    /**
     * 水卡地址
     */
    @NotBlank(message = "水卡地址不能为空")
    private String cardAddr;

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

    /**
     * 卡片费用
     */
    private Integer cardCost;

    /**
     * 退还金额
     */
    private Float reissueAmount;

    /**
     * 支付方式
     */
    @NotNull(message = "支付方式不能为空")
    private Long paymentId;

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

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