pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
@@ -57,7 +57,7 @@ * @param cardNum * @return */ Map getCardIdAndClientNum(@Param("cardNum") String cardNum); Map getCardIdAndClientNum(@Param("cardNum") Long cardNum); /** * 根据农户主键获取水卡列表 @@ -119,4 +119,11 @@ * @return */ List<VoCards> getUnreplaced(Map<?, ?> params); /** * 判断指定水卡是否为挂失状态且无补卡记录 * @param cardNum 水卡编号 * @return 符合条件记录数，最多一条 */ Integer isLostAndUnreplaced(@Param("cardNum") Long cardNum); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
@@ -80,6 +80,13 @@ private Byte state; /** * 原挂失卡ID */ @Schema(description = "卡片状态", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Positive(message = "原挂失卡ID必须为正数") private Long originalCardId; /** * 开卡时间 */ @Schema(description = "开卡时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -10,6 +10,7 @@ <result column="clientId" jdbcType="BIGINT" property="clientid" /> <result column="money" jdbcType="FLOAT" property="money" /> <result column="state" jdbcType="TINYINT" property="state" /> <result column="original_card_id" jdbcType="BIGINT" property="originalCardId"/> <result column="createDt" jdbcType="TIMESTAMP" property="createdt" /> <result column="replaceDt" jdbcType="TIMESTAMP" property="replacedt" /> <result column="rechargeDt" jdbcType="TIMESTAMP" property="rechargedt" /> @@ -24,7 +25,7 @@ </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt, id, cardAddr, cardNum, clientId, money, `state`, original_card_id, createDt, replaceDt, rechargeDt, lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> @@ -75,13 +76,13 @@ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard"> <!--@mbg.generated--> insert into se_client_card (id, cardAddr, cardNum, clientId, money, `state`, createDt, money, `state`, original_card_id, createDt, replaceDt, rechargeDt, lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks ) values (#{id,jdbcType=BIGINT}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{createdt,jdbcType=TIMESTAMP}, #{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{originalCardId,jdbcType=BIGINT}, #{createdt,jdbcType=TIMESTAMP}, #{replacedt,jdbcType=TIMESTAMP}, #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP}, #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP}, #{refunddt,jdbcType=TIMESTAMP}, #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR} @@ -106,6 +107,9 @@ </if> <if test="state != null"> `state`, </if> <if test="originalCardId != null"> original_card_id, </if> <if test="createdt != null"> createDt, @@ -156,6 +160,9 @@ </if> <if test="state != null"> #{state,jdbcType=TINYINT}, </if> <if test="originalCardId != null"> #{originalCardId,jdbcType=BIGINT}, </if> <if test="createdt != null"> #{createdt,jdbcType=TIMESTAMP}, @@ -211,6 +218,9 @@ <if test="state != null"> `state` = #{state,jdbcType=TINYINT}, </if> <if test="originalCardId != null"> `original_card_id` = #{originalCardId,jdbcType=BIGINT}, </if> <if test="createdt != null"> createDt = #{createdt,jdbcType=TIMESTAMP}, </if> @@ -255,6 +265,7 @@ clientId = #{clientid,jdbcType=BIGINT}, money = #{money,jdbcType=FLOAT}, `state` = #{state,jdbcType=TINYINT}, original_card_id = #{originalCardId,jdbcType=BIGINT}, createDt = #{createdt,jdbcType=TIMESTAMP}, replaceDt = #{replacedt,jdbcType=TIMESTAMP}, rechargeDt = #{rechargedt,jdbcType=TIMESTAMP}, @@ -415,7 +426,7 @@ FORMAT(card.money,2) AS money FROM se_client_card card INNER JOIN se_client cli ON card.clientId = cli.id WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card.clientId = card2.clientId AND card2.state = 1) WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.id) ORDER BY card.id <trim prefix="limit " > <if test="start != null and count != null"> @@ -423,4 +434,18 @@ </if> </trim> </select> <!--判断指定水卡是否为挂失状态且无补卡记录--> <select id="isLostAndUnreplaced" resultType="java.lang.Integer"> SELECT COUNT(*) AS recordCount FROM se_client_card card INNER JOIN se_client_card card2 ON card2.original_card_id = card.cardNum <where> AND card.state = 3 <if test = "cardNum != null and cardNum > 0"> AND card.cardNum = #{cardNum} </if> </where> </select> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -209,7 +209,7 @@ /** * 如果操作人员开卡时输入了充值金额，则开卡后调用充值功能 */ po.setCardNum(cardNum); po.setCardNum(Long.parseLong(cardNum)); if(amount != null && amount > 0) { po.setClientId(clientId); DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po); @@ -259,7 +259,7 @@ * activeTime 补卡时间 */ Long cardId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); //String clientNum = ""; Long clientId = 0L; Integer cardCost = po.getCardCost(); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java
@@ -44,7 +44,7 @@ * 补卡时使用 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private String cardNum; private Long cardNum; /** * 卡片费用 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
@@ -95,7 +95,7 @@ * cancelTime 挂失时间 */ Long cardId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Long clientId = 0L; Float refund = po.getRefund(); Byte refundType = po.getRefundType(); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/DtoCancel.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -101,7 +101,7 @@ * cardAddr 水卡地址（仅仅写入，无业务） * clientNum 农户编号 * cardCost 卡片费用 * amount 充值金额 * amount 充值金额，充值接口为输入参数，补卡接口为原卡退还金额 * reissueAmount 补卡金额，补卡时使用 * paymentId 支付方式编号 * remarks 备注 @@ -111,6 +111,7 @@ String cardAddr = po.getCardAddr(); String clientNum = po.getClientNum(); Integer cardCost = po.getCardCost(); Long originalCardId = po.getOriginalCardId(); Float amount = po.getAmount(); Long paymentId = po.getPaymentId(); String remarks = po.getRemarks(); @@ -123,28 +124,29 @@ Long clientId = cardOperateSv.getClientIdByNum(clientNum); /** * 添加农户卡记录 * 添加农户卡记录，退还金额作为当前余额 */ SeClientCard seClientCard = new SeClientCard(); seClientCard.setCardaddr(cardAddr); seClientCard.setCardnum(cardNum); seClientCard.setClientid(clientId); seClientCard.setMoney(0f); seClientCard.setMoney(amount); seClientCard.setState(CardStateENUM.NORMAL.getCode()); seClientCard.setOriginalCardId(originalCardId); seClientCard.setCreatedt(activeTime); seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode()); Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ; if(cardId == 0) { return BaseResponseUtils.buildFail(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage()); } /** * 添加开卡记录 * 添加开卡记录，退还金额作为充值金额 */ SeCardOperate seCardOperate = new SeCardOperate(); seCardOperate.setCardId(cardId); seCardOperate.setClientId(clientId); seCardOperate.setMoney(amount); seCardOperate.setCardCost(cardCost); seCardOperate.setPaymentId(paymentId); seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode()); @@ -158,9 +160,10 @@ /** * 如果操作人员开卡时输入了充值金额，则开卡后调用充值功能 * 补卡除外，补卡的退还金额是从挂失卡中转移过来的，没有实际金钱交易 */ po.setCardNum(cardNum); if(amount != null && amount > 0) { po.setCardNum(Long.parseLong(cardNum)); if(amount != null && amount > 0 && originalCardId == null) { po.setClientId(clientId); DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po); dtoRecharge.setMoney(0f); @@ -205,6 +208,7 @@ * cardAddr 新的水卡地址（仅仅写入，无业务） * clientNum 农户编号，开新卡使用，通过老卡号获取 * cardNum 水卡编号，传入的是老卡号，返回的是新卡号 * cardId 原水卡（挂失水卡）ID，转移余额后需要更新卡余额为0 * moeny 余额，挂失时使用 * cardCost 卡片费用 * paymentId 支付方式编号 @@ -214,17 +218,17 @@ String cardAddr = po.getCardAddr(); String clientNum = ""; String cardNum = po.getCardNum(); Float money = po.getMoney(); Long cardNum = po.getCardNum(); Long cardId = 0L; Integer cardCost = po.getCardCost(); Float reissueAmount = po.getReissueAmount(); Long paymentId = po.getPaymentId(); String remarks = po.getRemarks(); Long operator = po.getOperator(); // 验证水卡状态是否支持当前操作 String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse(""); if(stateName.length() == 0 || !stateName.equals("正常")) { return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); // 判断当前水卡是否为挂失状态且未补卡，仅已经挂失其未补卡的可以补卡 if(!cardOperateSv.isLostAndUnreplaced(cardNum)) { return BaseResponseUtils.buildFail(SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); } /** @@ -235,30 +239,25 @@ return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage()); } clientNum = map.get("clientNum").toString(); cardId = Long.parseLong(map.get("cardId").toString()); /** * 添加挂失记录 * 如果是补卡调用的开卡且转移了退还金额，需修改挂失卡余额为0 */ DtoLoss dtoLoss = new DtoLoss(); dtoLoss.setCardNum(cardNum); dtoLoss.setMoney(money); dtoLoss.setRefund(0f); dtoLoss.setRemarks(remarks); dtoLoss.setOperator(operator); BaseResponse<java.lang.Boolean> baseResponse_addLoss = this.add_loss(dtoLoss, null); if(!baseResponse_addLoss.getCode().equals("0001")) { return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage()); } SeClientCard seClientCard = new SeClientCard(); seClientCard.setId(cardId); seClientCard.setMoney(0f); cardOperateSv.updateClientCard(seClientCard); /** * 添加开卡记录 * 添加开卡记录，退还金额冲到新卡中 */ DtoActiveCard dtoActiveCard = new DtoActiveCard(); dtoActiveCard.setCardAddr(cardAddr); dtoActiveCard.setClientNum(clientNum); dtoActiveCard.setOriginalCardId(cardNum); dtoActiveCard.setCardCost(cardCost); dtoActiveCard.setAmount(0f); dtoActiveCard.setAmount(reissueAmount); dtoActiveCard.setPaymentId(paymentId); dtoActiveCard.setRemarks(remarks); dtoActiveCard.setOperator(operator); @@ -269,7 +268,7 @@ } String theContent = String.valueOf(baseResponse_addActive.getContent()); cardNum = theContent.substring(theContent.indexOf("=") + 1, theContent.indexOf(",")); cardNum = Long.parseLong(theContent.substring(theContent.indexOf("=") + 1, theContent.indexOf(","))); Map map_response = new HashMap(); map_response.put("projectCode", Constant.projectCode_ym); @@ -338,7 +337,7 @@ */ Long cardId = 0L; Long clientId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Float refund = po.getRefund(); Byte refundType = po.getRefundType(); String remarks = po.getRemarks(); @@ -346,7 +345,7 @@ Date cancelTime = new Date(); // 验证水卡状态是否支持当前操作 String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse(""); String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse(""); if(stateName.length() == 0 || !stateName.equals("正常")) { return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); } @@ -434,7 +433,7 @@ */ Long cardId = 0L; Long clientId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Float money = po.getMoney(); Float refund = po.getRefund(); String remarks = po.getRemarks(); @@ -442,7 +441,7 @@ Date lossTime = new Date(); // 验证水卡状态是否支持当前操作 String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse(""); String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse(""); if(stateName.length() == 0 || !stateName.equals("正常")) { return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); } @@ -529,7 +528,7 @@ */ Long cardId = 0L; Long clientId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Float cardBalance = po.getCardBalance(); Float systemBalance = po.getSystemBalance(); String remarks = po.getRemarks(); @@ -537,7 +536,7 @@ Date reversalTime = new Date(); // 验证水卡状态是否支持当前操作 String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse(""); String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse(""); if(stateName.length() == 0 || !stateName.equals("正常")) { return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); } @@ -622,7 +621,7 @@ */ Long cardId = 0L; Long clientId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Float money = po.getMoney(); Float refund = po.getRefund(); String remarks = po.getRemarks(); @@ -630,7 +629,7 @@ Date refundTime = new Date(); // 验证水卡状态是否支持当前操作 String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse(""); String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse(""); if(stateName.length() == 0 || !stateName.equals("正常")) { return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); } @@ -706,9 +705,9 @@ } /** * cardId 水卡编号（非传入参数，由cardAddr反查，修改农户卡使用） * cardId 水卡主键（非传入参数，由cardNum反查，修改农户卡使用） * clientId 农户编号（非传入参数，由cardNum反查） * cardNum 水卡地址 * cardNum 水卡编号 * money 余额 * remarks 备注 * operator 操作人编号 @@ -716,16 +715,15 @@ */ Long cardId = 0L; Long clientId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Float money = po.getMoney(); String remarks = po.getRemarks(); Long operator = po.getOperator(); Date unlockTime = new Date(); // 验证水卡状态是否支持当前操作 String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse(""); if(stateName.length() == 0 || !stateName.equals("已挂失")) { return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); // 判断当前水卡是否为挂失状态且未补卡，仅已经挂失其未补卡的可以解锁 if(!cardOperateSv.isLostAndUnreplaced(cardNum)) { return BaseResponseUtils.buildFail(SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); } /** @@ -827,7 +825,6 @@ return BaseResponseUtils.buildException(e.getMessage()) ; } } /** * 根据指定条件获取开卡记录 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -131,7 +131,7 @@ */ Long cardId = 0L; Long clientId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Float money = po.getMoney(); Float amount = po.getAmount(); Float gift = po.getGift(); @@ -144,7 +144,7 @@ // 验证水卡状态是否支持当前操作 String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse(""); String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse(""); if(stateName.length() == 0 || !stateName.equals("正常")) { return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage()); } @@ -198,7 +198,6 @@ return BaseResponseUtils.buildSuccess(true) ; } /** * 根据指定条件获取充值记录 @@ -416,4 +415,26 @@ return map_result; } /** * 判断指定水卡是否为挂失状态且无补卡记录 * @param cardNum 水卡编号 * @return 是否已挂失未补卡 */ public Boolean isLostAndUnreplaced(Long cardNum) { Integer rec = seClientCardMapper.isLostAndUnreplaced(cardNum); if(rec != null && rec > 0) { return false; } return true; } /** * 修改农户水卡 * @param po * @return */ public Integer updateClientCard(SeClientCard po) { return seClientCardMapper.updateByPrimaryKeySelective(po); } } pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
@@ -44,7 +44,13 @@ * 水卡编号，不是开卡接口传入，由农户编号获得，充值需要 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private String cardNum; private Long cardNum; /** * 原挂失卡ID */ @Schema(description = "原挂失卡ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private Long originalCardId; /** * 卡片费用 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoCancel.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoLoss.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank(message = "水卡编号不能为空") private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 余额 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoRecharge.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank(message = "水卡编号不能为空") private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户ID，不是充值接口传入，由开卡对象传入，保存充值记录需要 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoRefund.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank(message = "水卡编号不能为空") private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 卡片余额 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoReissue.java
@@ -28,30 +28,18 @@ @NotBlank(message = "水卡地址不能为空") private String cardAddr; ///** // * 农户编号，开卡使用 // */ //@Schema(description = "农户编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) //private String clientNum; /** * 农户ID（主键），不是开卡接口传入，由农户编号获得，保存开卡记录和充值记录都需要 */ //@Schema(description = "农户ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED) //private Long clientId; /** * 水卡编号，不是开卡接口传入，由农户编号获得，充值需要 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private String cardNum; private Long cardNum; /** * 金额 */ @Schema(description = "金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Min(value = 0, message="金额不能小于0") private Float money; //@Schema(description = "金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED) //@Min(value = 0, message="金额不能小于0") //private Float money; /** * 卡片费用 @@ -61,11 +49,11 @@ private Integer cardCost; /** * 补卡金额，开卡时充值用 * 退还金额，补开卡时充值用 */ //@Schema(description = "补卡金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED) //@Min(value = 0, message="补卡金额不能小于0") //private Float reissueAmount; @Schema(description = "退还金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Min(value = 0, message="退还金额不能小于0") private Float reissueAmount; /** * 支付方式编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoReversal.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank(message = "水卡编号不能为空") private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoUnlock.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank(message = "水卡编号不能为空") private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java
@@ -59,7 +59,7 @@ * @param cardNum * @return */ public Map getCardIdAndClientNum(String cardNum) { public Map getCardIdAndClientNum(Long cardNum) { return seClientCardMapper.getCardIdAndClientNum(cardNum); } /** pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/DtoLoss.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
@@ -93,7 +93,7 @@ * lossTime 挂失时间 */ Long cardId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Long clientId = 0L; Float money = po.getMoney(); Float refund = po.getRefund(); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/DtoRecharge.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,9 +26,9 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank(message = "水卡编号不能为空") @NotNull(message = "水卡编号不能为空") //private String cardAddr; private String cardNum; private Long cardNum; //private Long cardId; /** pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
@@ -99,7 +99,7 @@ * rechargeTime 充值时间 */ Long cardId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); String clientNum = ""; //Long clientId = po.getClientId(); Long clientId = 0L; pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/DtoReversal.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
@@ -92,7 +92,7 @@ * reversalTime 冲正 */ Long cardId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Long clientId = 0L; Float cardBalance = po.getCardBalance(); Float systemBalance = po.getSystemBalance(); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/DtoUnlock.java
@@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import lombok.*; @@ -26,8 +26,8 @@ * 水卡编号 */ @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @NotBlank(message = "水卡编号不能为空") private String cardNum; @NotNull(message = "水卡编号不能为空") private Long cardNum; /** * 农户编号 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java
@@ -93,7 +93,7 @@ * unlockTime 解锁时间 */ Long cardId = 0L; String cardNum = po.getCardNum(); Long cardNum = po.getCardNum(); Long clientId = 0L; Float money = po.getMoney(); String remarks = po.getRemarks();
