优化积分使用记录

java110-bean/src/main/java/com/java110/dto/integralGiftDetail/IntegralGiftDetailDto.java

@@ -18,13 +18,16 @@ public class IntegralGiftDetailDto extends PageDto implements Serializable {
     private String configName;
     private String createUserId;
     private String quantity;
-    private String configId;
     private String detailId;
+    private String acctId;
+    private String userName;
+    private String acctName;
+    private String configId;
+    private String acctDetailId;
     private String ruleName;
     private String tel;
     private String communityId;
     private String ruleId;
-    private String userName;
 
 
     private Date createTime;
@@ -56,6 +59,38 @@ public class IntegralGiftDetailDto extends PageDto implements Serializable {
         this.quantity = quantity;
     }
 
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+
+    public String getAcctId() {
+        return acctId;
+    }
+
+    public void setAcctId(String acctId) {
+        this.acctId = acctId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAcctName() {
+        return acctName;
+    }
+
+    public void setAcctName(String acctName) {
+        this.acctName = acctName;
+    }
+
     public String getConfigId() {
         return configId;
     }
@@ -64,12 +99,12 @@ public class IntegralGiftDetailDto extends PageDto implements Serializable {
         this.configId = configId;
     }
 
-    public String getDetailId() {
-        return detailId;
+    public String getAcctDetailId() {
+        return acctDetailId;
     }
 
-    public void setDetailId(String detailId) {
-        this.detailId = detailId;
+    public void setAcctDetailId(String acctDetailId) {
+        this.acctDetailId = acctDetailId;
     }
 
     public String getRuleName() {
@@ -104,14 +139,6 @@ public class IntegralGiftDetailDto extends PageDto implements Serializable {
         this.ruleId = ruleId;
     }
 
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
 
     public Date getCreateTime() {
         return createTime;

java110-bean/src/main/java/com/java110/dto/integralUserDetail/IntegralUserDetailDto.java

@@ -0,0 +1,132 @@
+package com.java110.dto.integralUserDetail;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 积分核销数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class IntegralUserDetailDto extends PageDto implements Serializable {
+
+    private String createUserId;
+private String uoId;
+private String acctId;
+private String remark;
+private String acctName;
+private String userName;
+private String detailType;
+private String useQuantity;
+private String money;
+private String acctDetailId;
+private String businessKey;
+private String tel;
+private String communityId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+public String getUoId() {
+        return uoId;
+    }
+public void setUoId(String uoId) {
+        this.uoId = uoId;
+    }
+public String getAcctId() {
+        return acctId;
+    }
+public void setAcctId(String acctId) {
+        this.acctId = acctId;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getAcctName() {
+        return acctName;
+    }
+public void setAcctName(String acctName) {
+        this.acctName = acctName;
+    }
+public String getUserName() {
+        return userName;
+    }
+public void setUserName(String userName) {
+        this.userName = userName;
+    }
+public String getDetailType() {
+        return detailType;
+    }
+public void setDetailType(String detailType) {
+        this.detailType = detailType;
+    }
+public String getUseQuantity() {
+        return useQuantity;
+    }
+public void setUseQuantity(String useQuantity) {
+        this.useQuantity = useQuantity;
+    }
+public String getMoney() {
+        return money;
+    }
+public void setMoney(String money) {
+        this.money = money;
+    }
+public String getAcctDetailId() {
+        return acctDetailId;
+    }
+public void setAcctDetailId(String acctDetailId) {
+        this.acctDetailId = acctDetailId;
+    }
+public String getBusinessKey() {
+        return businessKey;
+    }
+public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+public String getTel() {
+        return tel;
+    }
+public void setTel(String tel) {
+        this.tel = tel;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/integralGiftDetail/IntegralGiftDetailPo.java

@@ -17,9 +17,10 @@ package com.java110.po.integralGiftDetail;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
- * add by 吴学文 at 2022-12-12 01:54:09 mail: 928255095@qq.com
+ * add by 吴学文 at 2022-12-12 02:24:23 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
@@ -28,83 +29,131 @@ import java.util.Date;
 public class IntegralGiftDetailPo implements Serializable {
 
     private String configName;
-private String createUserId;
-private String quantity;
-private String configId;
-private String detailId;
-private String ruleName;
-private String tel;
-private String statusCd = "0";
-private String communityId;
-private String ruleId;
-private String userName;
-public String getConfigName() {
+    private String createUserId;
+    private String quantity;
+    private String detailId;
+    private String acctId;
+    private String statusCd = "0";
+    private String userName;
+    private String acctName;
+    private String configId;
+    private String acctDetailId;
+    private String ruleName;
+    private String tel;
+    private String communityId;
+    private String ruleId;
+
+    public String getConfigName() {
         return configName;
     }
-public void setConfigName(String configName) {
+
+    public void setConfigName(String configName) {
         this.configName = configName;
     }
-public String getCreateUserId() {
+
+    public String getCreateUserId() {
         return createUserId;
     }
-public void setCreateUserId(String createUserId) {
+
+    public void setCreateUserId(String createUserId) {
         this.createUserId = createUserId;
     }
-public String getQuantity() {
+
+    public String getQuantity() {
         return quantity;
     }
-public void setQuantity(String quantity) {
+
+    public void setQuantity(String quantity) {
         this.quantity = quantity;
     }
-public String getConfigId() {
+
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+
+    public String getAcctId() {
+        return acctId;
+    }
+
+    public void setAcctId(String acctId) {
+        this.acctId = acctId;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAcctName() {
+        return acctName;
+    }
+
+    public void setAcctName(String acctName) {
+        this.acctName = acctName;
+    }
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getDetailId() {
-        return detailId;
+
+    public String getAcctDetailId() {
+        return acctDetailId;
     }
-public void setDetailId(String detailId) {
-        this.detailId = detailId;
+
+    public void setAcctDetailId(String acctDetailId) {
+        this.acctDetailId = acctDetailId;
     }
-public String getRuleName() {
+
+    public String getRuleName() {
         return ruleName;
     }
-public void setRuleName(String ruleName) {
+
+    public void setRuleName(String ruleName) {
         this.ruleName = ruleName;
     }
-public String getTel() {
+
+    public String getTel() {
         return tel;
     }
-public void setTel(String tel) {
+
+    public void setTel(String tel) {
         this.tel = tel;
     }
-public String getStatusCd() {
-        return statusCd;
-    }
-public void setStatusCd(String statusCd) {
-        this.statusCd = statusCd;
-    }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getUserName() {
-        return userName;
-    }
-public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
 
 
 }

java110-bean/src/main/java/com/java110/po/integralUserDetail/IntegralUserDetailPo.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po.integralUserDetail;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2022-12-12 02:21:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public class IntegralUserDetailPo implements Serializable {
+
+    private String createUserId;
+private String uoId;
+private String acctId;
+private String remark;
+private String statusCd = "0";
+private String acctName;
+private String userName;
+private String detailType;
+private String useQuantity;
+private String money;
+private String acctDetailId;
+private String businessKey;
+private String tel;
+private String communityId;
+public String getCreateUserId() {
+        return createUserId;
+    }
+public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+public String getUoId() {
+        return uoId;
+    }
+public void setUoId(String uoId) {
+        this.uoId = uoId;
+    }
+public String getAcctId() {
+        return acctId;
+    }
+public void setAcctId(String acctId) {
+        this.acctId = acctId;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getAcctName() {
+        return acctName;
+    }
+public void setAcctName(String acctName) {
+        this.acctName = acctName;
+    }
+public String getUserName() {
+        return userName;
+    }
+public void setUserName(String userName) {
+        this.userName = userName;
+    }
+public String getDetailType() {
+        return detailType;
+    }
+public void setDetailType(String detailType) {
+        this.detailType = detailType;
+    }
+public String getUseQuantity() {
+        return useQuantity;
+    }
+public void setUseQuantity(String useQuantity) {
+        this.useQuantity = useQuantity;
+    }
+public String getMoney() {
+        return money;
+    }
+public void setMoney(String money) {
+        this.money = money;
+    }
+public String getAcctDetailId() {
+        return acctDetailId;
+    }
+public void setAcctDetailId(String acctDetailId) {
+        this.acctDetailId = acctDetailId;
+    }
+public String getBusinessKey() {
+        return businessKey;
+    }
+public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+public String getTel() {
+        return tel;
+    }
+public void setTel(String tel) {
+        this.tel = tel;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+
+
+}

java110-db/src/main/resources/mapper/acct/IntegralGiftDetailV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存积分赠送信息 add by wuxw 2018-07-03 -->
     <insert id="saveIntegralGiftDetailInfo" parameterType="Map">
         insert into integral_gift_detail(
-        config_name,create_user_id,quantity,config_id,detail_id,rule_name,tel,community_id,rule_id,user_name
+        config_name,create_user_id,quantity,detail_id,acct_id,user_name,acct_name,config_id,acct_detail_id,rule_name,tel,community_id,rule_id
         ) values (
-        #{configName},#{createUserId},#{quantity},#{configId},#{detailId},#{ruleName},#{tel},#{communityId},#{ruleId},#{userName}
+        #{configName},#{createUserId},#{quantity},#{detailId},#{acctId},#{userName},#{acctName},#{configId},#{acctDetailId},#{ruleName},#{tel},#{communityId},#{ruleId}
         )
     </insert>
 
@@ -18,9 +18,10 @@
     <!-- 查询积分赠送信息 add by wuxw 2018-07-03 -->
     <select id="getIntegralGiftDetailInfo" parameterType="Map" resultType="Map">
         select t.config_name,t.config_name configName,t.create_user_id,t.create_user_id
-        createUserId,t.quantity,t.config_id,t.config_id configId,t.detail_id,t.detail_id
-        detailId,t.rule_name,t.rule_name ruleName,t.tel,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
-        communityId,t.rule_id,t.rule_id ruleId,t.user_name,t.user_name userName,t.create_time createTime
+        createUserId,t.quantity,t.detail_id,t.detail_id detailId,t.acct_id,t.acct_id acctId,t.status_cd,t.status_cd
+        statusCd,t.user_name,t.user_name userName,t.acct_name,t.acct_name acctName,t.config_id,t.config_id
+        configId,t.acct_detail_id,t.acct_detail_id acctDetailId,t.rule_name,t.rule_name
+        ruleName,t.tel,t.community_id,t.community_id communityId,t.rule_id,t.rule_id ruleId,t.create_time createTime
         from integral_gift_detail t
         where 1 =1
         <if test="configName !=null and configName != ''">
@@ -32,11 +33,26 @@
         <if test="quantity !=null and quantity != ''">
             and t.quantity= #{quantity}
         </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="acctId !=null and acctId != ''">
+            and t.acct_id= #{acctId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="acctName !=null and acctName != ''">
+            and t.acct_name= #{acctName}
+        </if>
         <if test="configId !=null and configId != ''">
             and t.config_id= #{configId}
         </if>
-        <if test="detailId !=null and detailId != ''">
-            and t.detail_id= #{detailId}
+        <if test="acctDetailId !=null and acctDetailId != ''">
+            and t.acct_detail_id= #{acctDetailId}
         </if>
         <if test="ruleName !=null and ruleName != ''">
             and t.rule_name= #{ruleName}
@@ -44,18 +60,12 @@
         <if test="tel !=null and tel != ''">
             and t.tel= #{tel}
         </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
         <if test="ruleId !=null and ruleId != ''">
             and t.rule_id= #{ruleId}
         </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
-        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -79,9 +89,21 @@
         <if test="quantity !=null and quantity != ''">
             , t.quantity= #{quantity}
         </if>
+        <if test="acctId !=null and acctId != ''">
+            , t.acct_id= #{acctId}
+        </if>
+        <if test="userName !=null and userName != ''">
+            , t.user_name= #{userName}
+        </if>
+        <if test="acctName !=null and acctName != ''">
+            , t.acct_name= #{acctName}
+        </if>
         <if test="configId !=null and configId != ''">
             , t.config_id= #{configId}
         </if>
+        <if test="acctDetailId !=null and acctDetailId != ''">
+            , t.acct_detail_id= #{acctDetailId}
+        </if>
         <if test="ruleName !=null and ruleName != ''">
             , t.rule_name= #{ruleName}
         </if>
@@ -94,9 +116,6 @@
         <if test="ruleId !=null and ruleId != ''">
             , t.rule_id= #{ruleId}
         </if>
-        <if test="userName !=null and userName != ''">
-            , t.user_name= #{userName}
-        </if>
         where 1=1
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}
@@ -118,11 +137,26 @@
         <if test="quantity !=null and quantity != ''">
             and t.quantity= #{quantity}
         </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="acctId !=null and acctId != ''">
+            and t.acct_id= #{acctId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="acctName !=null and acctName != ''">
+            and t.acct_name= #{acctName}
+        </if>
         <if test="configId !=null and configId != ''">
             and t.config_id= #{configId}
         </if>
-        <if test="detailId !=null and detailId != ''">
-            and t.detail_id= #{detailId}
+        <if test="acctDetailId !=null and acctDetailId != ''">
+            and t.acct_detail_id= #{acctDetailId}
         </if>
         <if test="ruleName !=null and ruleName != ''">
             and t.rule_name= #{ruleName}
@@ -130,18 +164,12 @@
         <if test="tel !=null and tel != ''">
             and t.tel= #{tel}
         </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
         <if test="ruleId !=null and ruleId != ''">
             and t.rule_id= #{ruleId}
         </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
-        </if>
 
 
     </select>

java110-db/src/main/resources/mapper/acct/IntegralUserDetailV1ServiceDaoImplMapper.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="integralUserDetailV1ServiceDaoImpl">
+
+
+    <!-- 保存积分核销信息 add by wuxw 2018-07-03 -->
+    <insert id="saveIntegralUserDetailInfo" parameterType="Map">
+        insert into integral_user_detail(
+        create_user_id,uo_id,acct_id,remark,acct_name,user_name,detail_type,use_quantity,money,acct_detail_id,business_key,tel,community_id
+        ) values (
+        #{createUserId},#{uoId},#{acctId},#{remark},#{acctName},#{userName},#{detailType},#{useQuantity},#{money},#{acctDetailId},#{businessKey},#{tel},#{communityId}
+        )
+    </insert>
+
+
+    <!-- 查询积分核销信息 add by wuxw 2018-07-03 -->
+    <select id="getIntegralUserDetailInfo" parameterType="Map" resultType="Map">
+        select t.create_user_id,t.create_user_id createUserId,t.uo_id,t.uo_id uoId,t.acct_id,t.acct_id
+        acctId,t.remark,t.status_cd,t.status_cd statusCd,t.acct_name,t.acct_name acctName,t.user_name,t.user_name
+        userName,t.detail_type,t.detail_type detailType,t.use_quantity,t.use_quantity
+        useQuantity,t.money,t.acct_detail_id,t.acct_detail_id acctDetailId,t.business_key,t.business_key
+        businessKey,t.tel,t.community_id,t.community_id communityId,t.create_time createTime
+        from integral_user_detail t
+        where 1 =1
+        <if test="createUserId !=null and createUserId != ''">
+            and t.create_user_id= #{createUserId}
+        </if>
+        <if test="uoId !=null and uoId != ''">
+            and t.uo_id= #{uoId}
+        </if>
+        <if test="acctId !=null and acctId != ''">
+            and t.acct_id= #{acctId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="acctName !=null and acctName != ''">
+            and t.acct_name= #{acctName}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="detailType !=null and detailType != ''">
+            and t.detail_type= #{detailType}
+        </if>
+        <if test="useQuantity !=null and useQuantity != ''">
+            and t.use_quantity= #{useQuantity}
+        </if>
+        <if test="money !=null and money != ''">
+            and t.money= #{money}
+        </if>
+        <if test="acctDetailId !=null and acctDetailId != ''">
+            and t.acct_detail_id= #{acctDetailId}
+        </if>
+        <if test="businessKey !=null and businessKey != ''">
+            and t.business_key= #{businessKey}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改积分核销信息 add by wuxw 2018-07-03 -->
+    <update id="updateIntegralUserDetailInfo" parameterType="Map">
+        update integral_user_detail t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="createUserId !=null and createUserId != ''">
+            , t.create_user_id= #{createUserId}
+        </if>
+        <if test="acctId !=null and acctId != ''">
+            , t.acct_id= #{acctId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="acctName !=null and acctName != ''">
+            , t.acct_name= #{acctName}
+        </if>
+        <if test="userName !=null and userName != ''">
+            , t.user_name= #{userName}
+        </if>
+        <if test="detailType !=null and detailType != ''">
+            , t.detail_type= #{detailType}
+        </if>
+        <if test="useQuantity !=null and useQuantity != ''">
+            , t.use_quantity= #{useQuantity}
+        </if>
+        <if test="money !=null and money != ''">
+            , t.money= #{money}
+        </if>
+        <if test="acctDetailId !=null and acctDetailId != ''">
+            , t.acct_detail_id= #{acctDetailId}
+        </if>
+        <if test="businessKey !=null and businessKey != ''">
+            , t.business_key= #{businessKey}
+        </if>
+        <if test="tel !=null and tel != ''">
+            , t.tel= #{tel}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="uoId !=null and uoId != ''">
+            and t.uo_id= #{uoId}
+        </if>
+
+    </update>
+
+    <!-- 查询积分核销数量 add by wuxw 2018-07-03 -->
+    <select id="queryIntegralUserDetailsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from integral_user_detail t
+        where 1 =1
+        <if test="createUserId !=null and createUserId != ''">
+            and t.create_user_id= #{createUserId}
+        </if>
+        <if test="uoId !=null and uoId != ''">
+            and t.uo_id= #{uoId}
+        </if>
+        <if test="acctId !=null and acctId != ''">
+            and t.acct_id= #{acctId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="acctName !=null and acctName != ''">
+            and t.acct_name= #{acctName}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="detailType !=null and detailType != ''">
+            and t.detail_type= #{detailType}
+        </if>
+        <if test="useQuantity !=null and useQuantity != ''">
+            and t.use_quantity= #{useQuantity}
+        </if>
+        <if test="money !=null and money != ''">
+            and t.money= #{money}
+        </if>
+        <if test="acctDetailId !=null and acctDetailId != ''">
+            and t.acct_detail_id= #{acctDetailId}
+        </if>
+        <if test="businessKey !=null and businessKey != ''">
+            and t.business_key= #{businessKey}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+
+
+    </select>
+
+</mapper>

java110-interface/src/main/java/com/java110/intf/acct/IIntegralUserDetailV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.intf.acct;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.integralUserDetail.IntegralUserDetailDto;
+import com.java110.po.integralUserDetail.IntegralUserDetailPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-12-12 02:21:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@FeignClient(name = "acct-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/integralUserDetailV1Api")
+public interface IIntegralUserDetailV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveIntegralUserDetail", method = RequestMethod.POST)
+    public int saveIntegralUserDetail(@RequestBody  IntegralUserDetailPo integralUserDetailPo);
+
+    @RequestMapping(value = "/updateIntegralUserDetail", method = RequestMethod.POST)
+    public int updateIntegralUserDetail(@RequestBody  IntegralUserDetailPo integralUserDetailPo);
+
+    @RequestMapping(value = "/deleteIntegralUserDetail", method = RequestMethod.POST)
+    public int deleteIntegralUserDetail(@RequestBody  IntegralUserDetailPo integralUserDetailPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param integralUserDetailDto 数据对象分享
+     * @return IntegralUserDetailDto 对象数据
+     */
+    @RequestMapping(value = "/queryIntegralUserDetails", method = RequestMethod.POST)
+    List<IntegralUserDetailDto> queryIntegralUserDetails(@RequestBody IntegralUserDetailDto integralUserDetailDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param integralUserDetailDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryIntegralUserDetailsCount", method = RequestMethod.POST)
+    int queryIntegralUserDetailsCount(@RequestBody IntegralUserDetailDto integralUserDetailDto);
+}

service-acct/src/main/java/com/java110/acct/cmd/integral/ListIntegralUserDetailCmd.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.acct.cmd.integral;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.acct.IIntegralUserDetailV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.java110.dto.integralUserDetail.IntegralUserDetailDto;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：integralUserDetail.listIntegralUserDetail
+ * 请求路劲：/app/integralUserDetail.ListIntegralUserDetail
+ * add by 吴学文 at 2022-12-12 02:21:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "integral.listIntegralUserDetail")
+public class ListIntegralUserDetailCmd extends Cmd {
+
+  private static Logger logger = LoggerFactory.getLogger(ListIntegralUserDetailCmd.class);
+    @Autowired
+    private IIntegralUserDetailV1InnerServiceSMO integralUserDetailV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+           IntegralUserDetailDto integralUserDetailDto = BeanConvertUtil.covertBean(reqJson, IntegralUserDetailDto.class);
+
+           int count = integralUserDetailV1InnerServiceSMOImpl.queryIntegralUserDetailsCount(integralUserDetailDto);
+
+           List<IntegralUserDetailDto> integralUserDetailDtos = null;
+
+           if (count > 0) {
+               integralUserDetailDtos = integralUserDetailV1InnerServiceSMOImpl.queryIntegralUserDetails(integralUserDetailDto);
+           } else {
+               integralUserDetailDtos = new ArrayList<>();
+           }
+
+           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, integralUserDetailDtos);
+
+           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+           cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

service-acct/src/main/java/com/java110/acct/dao/IIntegralUserDetailV1ServiceDao.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.acct.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-12-12 02:21:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public interface IIntegralUserDetailV1ServiceDao {
+
+
+    /**
+     * 保存 积分核销信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveIntegralUserDetailInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询积分核销信息（instance过程）
+     * 根据bId 查询积分核销信息
+     * @param info bId 信息
+     * @return 积分核销信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getIntegralUserDetailInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改积分核销信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateIntegralUserDetailInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询积分核销总数
+     *
+     * @param info 积分核销信息
+     * @return 积分核销数量
+     */
+    int queryIntegralUserDetailsCount(Map info);
+
+}

service-acct/src/main/java/com/java110/acct/dao/impl/IntegralUserDetailV1ServiceDaoImpl.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.acct.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.acct.dao.IIntegralUserDetailV1ServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-12-12 02:21:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Service("integralUserDetailV1ServiceDaoImpl")
+public class IntegralUserDetailV1ServiceDaoImpl extends BaseServiceDao implements IIntegralUserDetailV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(IntegralUserDetailV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存积分核销信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveIntegralUserDetailInfo(Map info) throws DAOException {
+        logger.debug("保存 saveIntegralUserDetailInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("integralUserDetailV1ServiceDaoImpl.saveIntegralUserDetailInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询积分核销信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getIntegralUserDetailInfo(Map info) throws DAOException {
+        logger.debug("查询 getIntegralUserDetailInfo 入参 info : {}",info);
+
+        List<Map> businessIntegralUserDetailInfos = sqlSessionTemplate.selectList("integralUserDetailV1ServiceDaoImpl.getIntegralUserDetailInfo",info);
+
+        return businessIntegralUserDetailInfos;
+    }
+
+
+    /**
+     * 修改积分核销信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateIntegralUserDetailInfo(Map info) throws DAOException {
+        logger.debug("修改 updateIntegralUserDetailInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("integralUserDetailV1ServiceDaoImpl.updateIntegralUserDetailInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询积分核销数量
+     * @param info 积分核销信息
+     * @return 积分核销数量
+     */
+    @Override
+    public int queryIntegralUserDetailsCount(Map info) {
+        logger.debug("查询 queryIntegralUserDetailsCount 入参 info : {}",info);
+
+        List<Map> businessIntegralUserDetailInfos = sqlSessionTemplate.selectList("integralUserDetailV1ServiceDaoImpl.queryIntegralUserDetailsCount", info);
+        if (businessIntegralUserDetailInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessIntegralUserDetailInfos.get(0).get("count").toString());
+    }
+
+
+}

service-acct/src/main/java/com/java110/acct/smo/impl/IntegralUserDetailV1InnerServiceSMOImpl.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.acct.smo.impl;
+
+
+import com.java110.acct.dao.IIntegralUserDetailV1ServiceDao;
+import com.java110.intf.acct.IIntegralUserDetailV1InnerServiceSMO;
+import com.java110.dto.integralUserDetail.IntegralUserDetailDto;
+import com.java110.po.integralUserDetail.IntegralUserDetailPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-12-12 02:21:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@RestController
+public class IntegralUserDetailV1InnerServiceSMOImpl extends BaseServiceSMO implements IIntegralUserDetailV1InnerServiceSMO {
+
+    @Autowired
+    private IIntegralUserDetailV1ServiceDao integralUserDetailV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveIntegralUserDetail(@RequestBody  IntegralUserDetailPo integralUserDetailPo) {
+        int saveFlag = integralUserDetailV1ServiceDaoImpl.saveIntegralUserDetailInfo(BeanConvertUtil.beanCovertMap(integralUserDetailPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateIntegralUserDetail(@RequestBody  IntegralUserDetailPo integralUserDetailPo) {
+        int saveFlag = integralUserDetailV1ServiceDaoImpl.updateIntegralUserDetailInfo(BeanConvertUtil.beanCovertMap(integralUserDetailPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteIntegralUserDetail(@RequestBody  IntegralUserDetailPo integralUserDetailPo) {
+       integralUserDetailPo.setStatusCd("1");
+       int saveFlag = integralUserDetailV1ServiceDaoImpl.updateIntegralUserDetailInfo(BeanConvertUtil.beanCovertMap(integralUserDetailPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<IntegralUserDetailDto> queryIntegralUserDetails(@RequestBody  IntegralUserDetailDto integralUserDetailDto) {
+
+        //校验是否传了 分页信息
+
+        int page = integralUserDetailDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            integralUserDetailDto.setPage((page - 1) * integralUserDetailDto.getRow());
+        }
+
+        List<IntegralUserDetailDto> integralUserDetails = BeanConvertUtil.covertBeanList(integralUserDetailV1ServiceDaoImpl.getIntegralUserDetailInfo(BeanConvertUtil.beanCovertMap(integralUserDetailDto)), IntegralUserDetailDto.class);
+
+        return integralUserDetails;
+    }
+
+
+    @Override
+    public int queryIntegralUserDetailsCount(@RequestBody IntegralUserDetailDto integralUserDetailDto) {
+        return integralUserDetailV1ServiceDaoImpl.queryIntegralUserDetailsCount(BeanConvertUtil.beanCovertMap(integralUserDetailDto));    }
+
+}