2024-09-12 朱宝民 代码优化

zhubaomin

2024-09-13 1bebc1c02563033f6daaa3a13c482f1af04f1a21

2024-09-12 朱宝民 代码优化

 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml

@@ -24,7 +24,6 @@
                <item2 name="微信支付"/>
                <item3 name="支付宝支付"/>
                <item4 name="银行转账"/>
                <item5 name="换卡"/>
            </payments>
            <settings>
                <item1 item_name="lng" item_value="101.87345" remarks="经度"/>

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java

@@ -63,7 +63,6 @@
    private Integer projectNo;
    /**
     * 开卡
     * 当卡片费用为0时即为换卡操作，不收卡片费用，不收余额
     * @param po 开卡传入对象
     * @param bindingResult
     * @return 水卡编号
@@ -143,14 +142,14 @@
            seClientCard.setOriginalCardId(originalCardId);
        }
        seClientCard.setCreatedt(activeTime);
        if(cardCost == 0) {
            // 换卡
            seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
        }else {
            // 开卡
            seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
        }
        //if(cardCost == 0) {
        //    // 换卡
        //    seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
        //}else {
        //    // 开卡
        //seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
        //}
        seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
        Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
        if(cardId == 0) {
            return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
@@ -170,11 +169,12 @@
            seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
        }else {
            // 开新卡或换卡
            if(cardCost > 0) {
            //if(cardCost > 0) {
            //    seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
            //}else {
            //    seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
            //}
                seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
            }else {
                seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
            }
        }
        seCardOperate.setRemarks(remarks);
        seCardOperate.setOperator(operator);

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java

@@ -208,11 +208,12 @@
        seClientCard.setId(cardId);
        seClientCard.setMoney(afterRecharge);
        seClientCard.setRechargedt(rechargeTime);
        if(paymentName != null && paymentName.equals("换卡")) {
            seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
        }else {
        //if(paymentName != null && paymentName.equals("换卡")) {
        //    seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
        //}else {
        //    seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
        //}
            seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
        }
        Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
        if(rec_updateClientCard == 0) {
            return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
@@ -227,11 +228,12 @@
        seCardOperate.setMoney(money);
        seCardOperate.setTradeAmount(amount);
        seCardOperate.setGift(gift);
        if(paymentName != null && paymentName.equals("换卡")) {
            seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
        }else {
        //if(paymentName != null && paymentName.equals("换卡")) {
        //    seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
        //}else {
        //    seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
        //}
            seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
        }
        seCardOperate.setPaymentId(paymentId);
        seCardOperate.setPrice(price);
        seCardOperate.setRemarks(remarks);

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/enums/OperateTypeENUM.java

@@ -21,9 +21,9 @@
    LOSS((byte)6, "挂失"),
    REVERSAL((byte)7, "冲正"),
    UNLOCK((byte)8, "解锁"),
    CONSUME((byte)9, "消费"),
    CHANGE_CARD((byte)10, "换卡"),
    CHANGE_RECHARGE((byte)11, "换卡充值");
    CONSUME((byte)9, "消费");
    //CHANGE_CARD((byte)10, "换卡"),
    //CHANGE_RECHARGE((byte)11, "换卡充值");

    private final Byte code;
    private final String message;

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java

@@ -21,9 +21,9 @@
    LOSS((byte)6, "挂失"),
    REVERSAL((byte)7, "冲正"),
    UNLOCK((byte)8, "解锁"),
    CONSUME((byte)9, "消费"),
    CHANGE_CARD((byte)10,"换卡"),
    CHANGE_RECHARGE((byte)11,"换卡充值");
    CONSUME((byte)9, "消费");
    //CHANGE_CARD((byte)10,"换卡"),
    //CHANGE_RECHARGE((byte)11,"换卡充值");

    private final Byte code;
    private final String message;