2024-01-20 朱宝民 删除不存在用户提示信息，用户名字段改名，Long型字段转字符串

Administrator

2024-01-20 cf25cda454a645ea47ce6135184c3df6afd09ddc

2024-01-20 朱宝民 删除不存在用户提示信息，用户名字段改名，Long型字段转字符串

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java

@@ -47,6 +47,13 @@
    Long getAreaCodeByNum(@Param("clientNum") String clientNum);

    /**
     * 根据农户编号获取5级行政区划串areaCode，补卡过程中开新卡使用
     * @param clientId
     * @return
     */
    Long getAreaCodeById(@Param("clientId") Long clientId);

    /**
     * 根据农户编号获取农户ID
     * @param clientNum
     * @return

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java

@@ -67,7 +67,7 @@
    @Schema(description = "姓名", requiredMode = Schema.RequiredMode.REQUIRED)
    @NotEmpty(message = "姓名不能为空") //不能为空也不能为null
    @Length(message = "姓名不大于{max}字，不小于{min}字", min = 2, max = 25)
    public String name;
    public String userName;

    /**
     * 手机号，手机号用于登录系统

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java

@@ -122,6 +122,12 @@
    private Date reversaldt;

    /**
     * 补扣时间
     */
    @Schema(description = "补扣时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Date refunddt;

    /**
     * 消费时间
     */
    @Schema(description = "消费时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java

@@ -21,7 +21,7 @@
    private static final long serialVersionUID = 1L;

    @Schema(title = "用户ID")
    private Long userId;
    private String userId;

    @Schema(title = "用户姓名")
    private String userName;
@@ -30,7 +30,7 @@
    private String phone;

    @Schema(title = "片区ID")
    private Long blockId;
    private String blockId;

    @Schema(title = "片区名称")
    private String blockName;

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml

@@ -8,7 +8,7 @@
        <!--@Table ba_user-->
        <id property="id" column="id" />
        <result property="blockId" column="blockId"/>
        <result property="name" column="name"/>
        <result property="userName" column="name"/>
        <result property="phone" column="phone"/>
        <result property="password" column="password"/>
        <result property="orgTag" column="orgTag"/>
@@ -21,7 +21,7 @@
        <!--@mbg.generated-->
        <!--@Table ba_user-->
        <id property="id" column="id" />
        <result property="name" column="name"/>
        <result property="userName" column="name"/>
        <result property="phone" column="phone"/>
        <result property="orgTag" column="orgTag"/>
        <result property="supperAdmin" column="supperAdmin"/>
@@ -31,7 +31,7 @@
    <resultMap id="loginResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
        <id property="id" column="id" />
        <result property="blockId" column="blockId"/>
        <result property="name" column="name"/>
        <result property="userName" column="name"/>
        <result property="phone" column="phone"/>
        <result property="orgTag" column="orgTag"/>
        <result property="supperAdmin" column="supperAdmin"/>
@@ -102,7 +102,7 @@
        insert into ba_user (<include refid="Base_Column_List" />)
        values (#{id,jdbcType=BIGINT},
        #{blockId,jdbcType=BIGINT},
        #{name,jdbcType=VARCHAR},
        #{userName,jdbcType=VARCHAR},
        #{phone,jdbcType=VARCHAR},
        #{password,jdbcType=VARCHAR},
        #{orgTag,jdbcType=VARCHAR},
@@ -120,7 +120,7 @@
            <if test="blockId != null">
                blockId,
            </if>
           <if test="name != null">
           <if test="userName != null">
                `name`,
            </if>
            <if test="phone != null">
@@ -149,8 +149,8 @@
            <if test="blockId != null">
                #{blockId,jdbcType=BIGINT},
            </if>
           <if test="name != null">
                #{name,jdbcType=VARCHAR},
           <if test="userName != null">
                #{userName,jdbcType=VARCHAR},
            </if>
            <if test="phone != null">
                #{phone,jdbcType=VARCHAR},
@@ -179,8 +179,8 @@
            <if test="blockId != null">
                blockId = #{blockId,jdbcType=BIGINT},
            </if>
           <if test="name != null">
                `name` = #{name,jdbcType=VARCHAR},
           <if test="userName != null">
                `name` = #{userName,jdbcType=VARCHAR},
            </if>
            <if test="phone != null">
                phone = #{phone,jdbcType=VARCHAR},
@@ -200,7 +200,7 @@
    <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
        update ba_user
        set blockId = #{blockId,jdbcType=BIGINT},
        `name` = #{name,jdbcType=VARCHAR},
        `name` = #{userName,jdbcType=VARCHAR},
        phone = #{phone,jdbcType=VARCHAR},
        password = #{password,jdbcType=VARCHAR},
        disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -284,7 +284,7 @@
    <!--根据指定条件获取用户列表-->
    <select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
        SELECT
            id AS userId,
            CAST(id AS char) AS userId,
            phone,
            name AS userName,
            disabled AS stateId,
@@ -292,7 +292,7 @@
                 WHEN disabled = 0 THEN "正常"
                 WHEN disabled = 1 THEN "已禁用"
                END) AS stateName,
            blockId,
            CAST(blockId AS char) AS blockId,
            (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
        FROM ba_user user
            INNER JOIN ba_user_role usro ON usro.userId = user.id

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml

@@ -17,14 +17,15 @@
    <result column="cancelDt" jdbcType="TIMESTAMP" property="canceldt" />
    <result column="unlockDt" jdbcType="TIMESTAMP" property="unlockdt" />
    <result column="reversalDt" jdbcType="TIMESTAMP" property="reversaldt" />
    <result column="refundDt" jdbcType="TIMESTAMP" property="refunddt" />
    <result column="consumeDt" jdbcType="TIMESTAMP" property="consumedt" />
    <result column="lastOper" jdbcType="TINYINT" property="lastoper" />
    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt, 
    lossDtDt, cancelDt, unlockDt, reversalDt, consumeDt, lastOper, remarks
    id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt,
    lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <!--@mbg.generated-->
@@ -76,14 +77,14 @@
    insert into se_client_card (id, cardAddr, cardNum, clientId,
      money, `state`, createDt, 
      replaceDt, rechargeDt, lossDtDt, 
      cancelDt, unlockDt, reversalDt, 
      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}, 
      #{replacedt,jdbcType=TIMESTAMP}, #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP}, 
      #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP}, 
      #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}
      #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP},
      #{refunddt,jdbcType=TIMESTAMP}, #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}
      )

  </insert>
@@ -126,6 +127,9 @@
      </if>
      <if test="reversaldt != null">
        reversalDt,
      </if>
      <if test="refunddt != null">
        refundDt,
      </if>
      <if test="consumedt != null">
        consumeDt,
@@ -173,6 +177,9 @@
      </if>
      <if test="reversaldt != null">
        #{reversaldt,jdbcType=TIMESTAMP},
      </if>
      <if test="refunddt != null">
        #{refunddt,jdbcType=TIMESTAMP},
      </if>
      <if test="consumedt != null">
        #{consumedt,jdbcType=TIMESTAMP},
@@ -225,6 +232,9 @@
      <if test="reversaldt != null">
        reversalDt = #{reversaldt,jdbcType=TIMESTAMP},
      </if>
      <if test="refunddt != null">
        refundDt = #{refunddt,jdbcType=TIMESTAMP},
      </if>
      <if test="consumedt != null">
        consumeDt = #{consumedt,jdbcType=TIMESTAMP},
      </if>
@@ -252,6 +262,7 @@
      cancelDt = #{canceldt,jdbcType=TIMESTAMP},
      unlockDt = #{unlockdt,jdbcType=TIMESTAMP},
      reversalDt = #{reversaldt,jdbcType=TIMESTAMP},
      refundDt = #{refunddt,jdbcType=TIMESTAMP},
      consumeDt = #{consumedt,jdbcType=TIMESTAMP},
      lastOper = #{lastoper,jdbcType=TINYINT},
      remarks = #{remarks,jdbcType=VARCHAR}

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml

@@ -394,6 +394,11 @@
    SELECT districtNum FROM se_client WHERE clientNum = ${clientNum}
  </select>

  <!--根据农户编号获取5级行政区划串areaCode，补卡过程中开新卡使用-->
  <select id="getAreaCodeById" resultType="java.lang.Long">
    SELECT districtNum FROM se_client WHERE id = ${clientId}
  </select>

  <!--根据农户编号获取农户ID-->
  <select id="getClientIdByNum" resultType="java.lang.Long">
    SELECT id FROM se_client WHERE clientNum = ${clientNum}

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/result/SystemResultCode.java

@@ -21,7 +21,8 @@
    ROLE_NAME_EXIST(10003, "角色名称已存在"),
    NO_ROLES(10004, "没有符合条件的角色记录"),
    PLEASE_INPUT_ROLE_ID(10005, "角色编号不能为空"),
    DELETE_ROLE_FAIL(10006, "删除角色失败");
    DELETE_ROLE_FAIL(10006, "删除角色失败"),
    USER_NOT_EXIST(10007, "删除的用户不存在");

    private final Integer code;
    private final String message;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java

@@ -9,6 +9,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrBase.result.SystemResultCode;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import com.dy.pipIrrGlobal.util.Constant;
import com.dy.pipIrrGlobal.voBa.VoUserInfo;
@@ -469,7 +470,7 @@
            return BaseResponseUtils.buildException(e.getMessage());
        }
        if (count <= 0) {
            return BaseResponseUtils.buildFail("数据库存储失败");
            return BaseResponseUtils.buildFail(SystemResultCode.USER_NOT_EXIST.getMessage());
        } else {
            return BaseResponseUtils.buildSuccess(true);
        }

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java

@@ -87,10 +87,10 @@
        if(list_users.size() > 0) {
            for(int i = 0; i < list_users.size(); i++) {
                VoUserInfo voUserInfo = list_users.get(i);
                Long userId = voUserInfo.getUserId();
                String userId = voUserInfo.getUserId();

                JSONArray array_roleIds = new JSONArray();
                List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(userId)).orElse(new ArrayList<>());
                List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
                for (int j = 0; j < list_roleIds.size(); j++) {
                    Map map_roleId = list_roleIds.get(j);
                    if(map_roleId != null) {
@@ -101,7 +101,7 @@
                List<Map<String, Object>> list_roleId = (List<Map<String, Object>>) JSON.parse(array_roleIds.toJSONString());

                JSONArray array_roleNames = new JSONArray();
                List<Map<String, Object>> list_roleNames = Optional.ofNullable(this.dao.getRoleNamesByUserId(userId)).orElse(new ArrayList<>());
                List<Map<String, Object>> list_roleNames = Optional.ofNullable(this.dao.getRoleNamesByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
                for (int j = 0; j < list_roleNames.size(); j++) {
                    Map map_roleName = list_roleNames.get(j);
                    if(map_roleName != null) {
@@ -227,7 +227,7 @@
        JSONArray array_permission = new JSONArray();
        Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap());
        if(map.size() > 0) {
            voUserInfo.setUserId(userId);
            voUserInfo.setUserId(String.valueOf(userId));
            voUserInfo.setUserName(map.get("userName").toString());
        }


 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java

@@ -169,7 +169,7 @@
                (password != null && !password.trim().equals("")) &&
                supperAdmin != null){
            BaUser po = new BaUser() ;
            po.name = name ;
            po.userName = name ;
            po.phone = phone ;
            po.password = MD5.encrypt(password) ;//进行加密码 ;
            po.orgTag = orgTag ;

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

@@ -193,75 +193,79 @@
    @PostMapping(path = "reissue", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add_reissue(@RequestBody @Valid com.dy.pipIrrSell.activeCard.DtoActiveCard po, BindingResult bindingResult){
    public BaseResponse<Boolean> add_reissue(@RequestBody @Valid DtoReissue po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        /**
         * cardId           水卡编号（非传入参数，由cardNum反查，更新水卡表用）
         * cardNum          水卡编号
         * clientId         农户ID（非传入参数，由cardNum反查，添加补卡使用）
         * cardAddr         新的水卡地址（仅仅写入，无业务）
         * clientNum        农户编号，开新卡使用，通过老卡号获取
         * cardNum          水卡编号，传入的是老卡号，返回的是新卡号
         * moeny            余额，挂失时使用
         * cardCost         卡片费用
         * reissueAmount    补卡金额，补卡时使用
         * paymentId        支付方式编号
         * remarks          备注
         * operator         操作人编号
         * activeTime       补卡时间
         */
        Long cardId = 0L;
        Long clientId = 0L;

        String cardAddr = po.getCardAddr();
        String clientNum = "";
        String cardNum = po.getCardNum();
        Float money = po.getMoney();
        Integer cardCost = po.getCardCost();
        Float reissueAmount = po.getReissueAmount();
        Long paymentId = po.getPaymentId();
        String remarks = po.getRemarks();
        Long operator = po.getOperator();
        Date reissueTime = new Date();

        /**
         * 依据水卡编号获取水卡表主键及农户编号
         */
        Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
        if(map == null || map.size() <= 0) {
            return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_ERROR.getMessage());
            return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
        }
        cardId = Long.parseLong(map.get("cardId").toString());
        clientId = Long.parseLong(map.get("clientId").toString());
        clientNum = map.get("clientNum").toString();

        /**
         * 修改农户卡信息：
         *      补卡时间
         *      最后操作类型-2
         * 添加挂失记录
         */
        SeClientCard seClientCard = new SeClientCard();
        seClientCard.setId(cardId);
        seClientCard.setReplacedt(reissueTime);
        seClientCard.setLastoper(LastOperateENUM.REPLACE.getCode());
        Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
        if(rec_updateClientCard == 0) {
            return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
        }
        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);

        /**
         * 添加补卡记录
         */
        SeCardOperate seCardOperate = new SeCardOperate();
        seCardOperate.setCardId(cardId);
        seCardOperate.setClientId(clientId);
        seCardOperate.setCardCost(cardCost);
        seCardOperate.setPaymentId(paymentId);
        seCardOperate.setNoTradeAmount(reissueAmount);
        seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
        seCardOperate.setRemarks(remarks);
        seCardOperate.setOperator(operator);
        seCardOperate.setOperateDt(reissueTime);
        Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
        if(rec == 0) {
        if(!baseResponse_addLoss.getCode().equals("0001")) {
            return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
        }

        return BaseResponseUtils.buildSuccess(true) ;
        /**
         * 添加开卡记录
         */
        DtoActiveCard dtoActiveCard = new DtoActiveCard();
        dtoActiveCard.setCardAddr(cardAddr);
        dtoActiveCard.setClientNum(clientNum);
        dtoActiveCard.setCardCost(cardCost);
        dtoActiveCard.setAmount(0f);
        dtoActiveCard.setPaymentId(paymentId);
        dtoActiveCard.setRemarks(remarks);
        dtoActiveCard.setOperator(operator);
        BaseResponse<java.lang.Boolean> baseResponse_addActive = add_active(dtoActiveCard, null);

        if(!baseResponse_addActive.getCode().equals("0001")) {
            return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
        }

        String theContent = String.valueOf(baseResponse_addActive.getContent());
        cardNum = theContent.substring(theContent.indexOf("=") + 1, theContent.indexOf(","));

        Map map_response = new HashMap();
        map_response.put("projectCode", Constant.projectCode_ym);
        map_response.put("cardNum", cardNum);
        return BaseResponseUtils.buildSuccess(map_response) ;
    }

    /**
@@ -282,7 +286,7 @@
    @PostMapping(path = "recharge", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult){
    public BaseResponse<Boolean> add_recharge(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -307,7 +311,7 @@
    @PostMapping(path = "cancel", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoCancel po, BindingResult bindingResult){
    public BaseResponse<Boolean> add_cancel(@RequestBody @Valid DtoCancel po, BindingResult bindingResult){
        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -396,7 +400,7 @@
    @PostMapping(path = "loss", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoLoss po, BindingResult bindingResult){
    public BaseResponse<Boolean> add_loss(@RequestBody @Valid DtoLoss po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -466,6 +470,12 @@
        return BaseResponseUtils.buildSuccess(true) ;
    }

    /**
     * 冲正
     * @param po
     * @param bindingResult
     * @return
     */
    @Operation(summary = "添加冲正记录", description = "添加冲正记录")
    @ApiResponses(value = {
            @ApiResponse(
@@ -478,7 +488,7 @@
    @PostMapping(path = "reversal", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoReversal po, BindingResult bindingResult){
    public BaseResponse<Boolean> add_reversal(@RequestBody @Valid DtoReversal po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -547,4 +557,176 @@
        return BaseResponseUtils.buildSuccess(true) ;
    }

    /**
     * 补扣
     * @param po
     * @param bindingResult
     * @return
     */
    @Operation(summary = "补扣", description = "补扣")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "操作结果：true：成功，false：失败（BaseResponse.content）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = Boolean.class))}
            )
    })
    @PostMapping(path = "refund", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add_refund(@RequestBody @Valid DtoRefund po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        /**
         * cardId           水卡编号（非传入参数，由cardNum反查，修改农户卡使用）
         * clientId         农户编号（非传入参数，由cardNum反查）
         * cardNum          水卡编号
         * money            卡片余额
         * refund           补扣余额
         * remarks          备注
         * operator         操作人编号
         * refundTime       补扣时间
         */
        Long cardId = 0L;
        Long clientId = 0L;
        String cardNum = po.getCardNum();
        Float money = po.getMoney();
        Float refund = po.getRefund();
        String remarks = po.getRemarks();
        Long operator = po.getOperator();
        Date refundTime = new Date();

        /**
         * 依据水卡编号获取水卡表主键及农户编号
         */
        Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
        if(map == null || map.size() <= 0) {
            return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
        }
        cardId = Long.parseLong(map.get("cardId").toString());
        clientId = Long.parseLong(map.get("clientId").toString());

        /**
         * 修改农户卡信息：
         *      挂失时间
         *      最后操作类型-4
         */
        SeClientCard seClientCard = new SeClientCard();
        seClientCard.setId(cardId);
        seClientCard.setRefunddt(refundTime);
        seClientCard.setMoney(money + refund);
        seClientCard.setLastoper(LastOperateENUM.REFUND.getCode());
        Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
        if(rec_updateClientCard == 0) {
            return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
        }

        /**
         * 添加补扣记录
         */
        SeCardOperate seCardOperate = new SeCardOperate();
        seCardOperate.setCardId(cardId);
        seCardOperate.setClientId(clientId);
        seCardOperate.setMoney(money);
        seCardOperate.setNoTradeAmount(refund);
        seCardOperate.setOperateType(OperateTypeENUM.REFUND.getCode());
        seCardOperate.setRemarks(remarks);
        seCardOperate.setOperator(operator);
        seCardOperate.setOperateDt(refundTime);
        Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
        if(rec == 0) {
            return BaseResponseUtils.buildFail(SellResultCode.REFUND_FAIL_WRITE_REFUND_ERROR.getMessage());
        }

        return BaseResponseUtils.buildSuccess(true) ;
    }

    /**
     * 解锁
     * @param po
     * @param bindingResult
     * @return
     */
    @Operation(summary = "添加解锁记录", description = "添加解锁记录")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "操作结果：true：成功，false：失败（BaseResponse.content）",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = Boolean.class))}
            )
    })
    @PostMapping(path = "unlock", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add_unlock(@RequestBody @Valid DtoUnlock po, BindingResult bindingResult){
        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        /**
         * cardId           水卡编号（非传入参数，由cardAddr反查，修改农户卡使用）
         * clientId         农户编号（非传入参数，由cardNum反查）
         * cardNum          水卡地址
         * money            余额
         * remarks          备注
         * operator         操作人编号
         * unlockTime       解锁时间
         */
        Long cardId = 0L;
        Long clientId = 0L;
        String cardNum = po.getCardNum();
        Float money = po.getMoney();
        String remarks = po.getRemarks();
        Long operator = po.getOperator();
        Date unlockTime = new Date();

        /**
         * 依据水卡编号获取水卡表主键及农户编号
         */
        Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
        if(map == null || map.size() <= 0) {
            return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
        }
        cardId = Long.parseLong(map.get("cardId").toString());
        clientId = Long.parseLong(map.get("clientId").toString());

        /**
         * 修改农户卡信息：
         *      挂失时间
         *      最后操作类型-4
         */
        SeClientCard seClientCard = new SeClientCard();
        seClientCard.setId(cardId);
        seClientCard.setUnlockdt(unlockTime);
        seClientCard.setMoney(money);
        seClientCard.setState(CardStateENUM.NORMAL.getCode());
        seClientCard.setLastoper(LastOperateENUM.UNLOCK.getCode());
        Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
        if(rec_updateClientCard == 0) {
            return BaseResponseUtils.buildFail(SellResultCode.UNLOCK_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
        }

        /**
         * 添加解锁记录
         */
        SeCardOperate seCardOperate = new SeCardOperate();
        seCardOperate.setCardId(cardId);
        seCardOperate.setClientId(clientId);
        seCardOperate.setMoney(money);
        seCardOperate.setOperateType(OperateTypeENUM.UNLOCK.getCode());
        seCardOperate.setRemarks(remarks);
        seCardOperate.setOperator(operator);
        seCardOperate.setOperateDt(unlockTime);
        Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
        if(rec == 0) {
            return BaseResponseUtils.buildFail(SellResultCode.UNLOCK_FAIL_WRITE_UNLOCK_ERROR.getMessage());
        }

        return BaseResponseUtils.buildSuccess(true) ;
    }
}

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

@@ -64,6 +64,14 @@
    }

    /**
     * 根据农户编号获取5级行政区划串areaCode，补卡过程中开新卡使用
     * @param clientId
     * @return
     */
    public Long getAreaCodeById(Long clientId) {
        return seClientMapper.getAreaCodeById(clientId);
    }
    /**
     * 根据行政区划串模块查询水卡编号，开卡使用
     * @param areaCode
     * @return

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

@@ -18,7 +18,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "开卡/补卡传入对象")
@Schema(name = "开卡传入对象")
public class DtoActiveCard {
    public static final long serialVersionUID = 202401181945001L;
    /**

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

New file
@@ -0,0 +1,58 @@
package com.dy.pipIrrSell.cardOperate.dto;

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

/**
 * @author ZhuBaoMin
 * @date 2024-01-19 18:35
 * @LastEditTime 2024-01-19 18:35
 * @Description
 */

@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "补扣传入对象")
public class DtoRefund {
    public static final long serialVersionUID = 202401191836001L;

    /**
     * 水卡编号
     */
    @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @NotBlank(message = "水卡编号不能为空")
    private String 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 refund;

    /**
     * 备注信息
     */
    @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String remarks;

    /**
     * 操作人编号
     */
    @Schema(description = "操作人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Positive(message = "操作人编号必须为大于0的整数")
    private Long operator;
}

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

New file
@@ -0,0 +1,89 @@
package com.dy.pipIrrSell.cardOperate.dto;

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

/**
 * @author ZhuBaoMin
 * @date 2024-01-19 20:43
 * @LastEditTime 2024-01-19 20:43
 * @Description
 */

@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "补卡传入对象")
public class DtoReissue {
    public static final long serialVersionUID = 202401192044001L;
    /**
     * 水卡地址，仅保存，无业务
     */
    @Schema(description = "水卡地址", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @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;

    /**
     * 金额
     */
    @Schema(description = "金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Min(value = 0, message="金额不能小于0")
    private Float money;

    /**
     * 卡片费用
     */
    @Schema(description = "卡片费用", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Positive(message = "卡片费用必须为大于0的整数")
    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)
    @Positive(message = "支付方式编号必须为大于0的整数")
    private Long paymentId;

    /**
     * 备注信息
     */
    @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String remarks;

    /**
     * 操作人编号
     */
    @Schema(description = "操作人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Positive(message = "操作人编号必须为大于0的整数")
    private Long operator;
}

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

New file
@@ -0,0 +1,57 @@
package com.dy.pipIrrSell.cardOperate.dto;

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

/**
 * @author ZhuBaoMin
 * @date 2024-01-19 20:18
 * @LastEditTime 2024-01-19 20:18
 * @Description
 */

@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "解锁传入对象")
public class DtoUnlock {
    public static final long serialVersionUID = 202401192019001L;

    /**
     * 水卡编号
     */
    @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @NotBlank(message = "水卡编号不能为空")
    private String cardNum;

    /**
     * 农户编号
     */
    @Schema(description = "农户编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String clientNum;

    /**
     * 余额
     */
    @Schema(description = "余额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Min(value = 0, message="余额不能小于0")
    private Float money;

    /**
     * 备注信息
     */
    @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String remarks;

    /**
     * 操作人编号
     */
    @Schema(description = "操作人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Positive(message = "操作人编号必须为大于0的整数")
    private Long operator;
}

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

@@ -20,7 +20,8 @@
    REFUND((byte)5, "补扣"),
    LOSS((byte)6, "挂失"),
    REVERSAL((byte)7, "冲正"),
    UNLOCK((byte)8, "解锁");
    UNLOCK((byte)8, "解锁"),
    CONSUME((byte)9, "消费");

    private final Byte code;
    private final String message;

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

@@ -14,13 +14,14 @@
@AllArgsConstructor
public enum LastOperateENUM {
    ACTIVE((byte)1, "开卡"),
    REPLACE((byte)2, "补卡"),
    RECHARGE((byte)3, "充值"),
    LOSS((byte)4, "挂失"),
    CANCEL((byte)5, "注销"),
    UNLOCK((byte)6, "解锁"),
    RECHARGE((byte)2, "充值"),
    CANCEL((byte)3, "注销"),
    REPLACE((byte)4, "补卡"),
    REFUND((byte)5, "补扣"),
    LOSS((byte)6, "挂失"),
    REVERSAL((byte)7, "冲正"),
    CONSUME((byte)8, "消费");
    UNLOCK((byte)8, "解锁"),
    CONSUME((byte)9, "消费");

    private final Byte code;
    private final String message;

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java

@@ -55,7 +55,12 @@
     * 冲正
     */
    REVERSAL_FAIL_WRITE_CLIENT_CARD_ERROR(60001, "冲正失败-农户卡修改异常"),
    REVERSAL_FAIL_WRITE_REVERSAL_ERROR(60002, "冲正失败-冲正记录写入异常");
    REVERSAL_FAIL_WRITE_REVERSAL_ERROR(60002, "冲正失败-冲正记录写入异常"),

    /**
     * 补扣
     */
    REFUND_FAIL_WRITE_REFUND_ERROR(70001, "补扣失败-补扣记录写入异常");

    private final Integer code;
    private final String message;