优化代码

java110-bean/src/main/java/com/java110/dto/couponDetail/CouponDetailDto.java

@@ -23,6 +23,7 @@ private String validityDay;
 private String poolId;
 private String detailId;
 private String shopId;
+private String orderId;
 
 
     private Date createTime;
@@ -100,4 +101,12 @@ public void setShopId(String shopId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/couponPool/CouponPoolDto.java

@@ -20,6 +20,7 @@ private String couponStock;
 private String actualPrice;
 private String validityDay;
 private String couponType;
+private String couponTypeName;
 private String poolId;
 private String state;
 private String seq;
@@ -101,4 +102,12 @@ public void setSeq(String seq) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCouponTypeName() {
+        return couponTypeName;
+    }
+
+    public void setCouponTypeName(String couponTypeName) {
+        this.couponTypeName = couponTypeName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/couponShopPoolDetail/CouponShopPoolDetailDto.java

@@ -25,6 +25,7 @@ private String userId;
 private String poolId;
 private String tel;
 private String shopId;
+private String orderId;
 
 
     private Date createTime;
@@ -115,4 +116,12 @@ public void setShopId(String shopId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/couponUserDetail/CouponUserDetailDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.couponUserDetail;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,13 @@ import java.util.Date;
 public class CouponUserDetailDto extends PageDto implements Serializable {
 
     private String couponName;
-private String uoId;
-private String objId;
-private String couponId;
-private String userName;
-private String userId;
-private String objType;
+    private String uoId;
+    private String objId;
+    private String couponId;
+    private String userName;
+    private String userId;
+    private String objType;
+    private String orderId;
 
 
     private Date createTime;
@@ -31,43 +33,56 @@ private String objType;
     public String getCouponName() {
         return couponName;
     }
-public void setCouponName(String couponName) {
+
+    public void setCouponName(String couponName) {
         this.couponName = couponName;
     }
-public String getUoId() {
+
+    public String getUoId() {
         return uoId;
     }
-public void setUoId(String uoId) {
+
+    public void setUoId(String uoId) {
         this.uoId = uoId;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getCouponId() {
+
+    public String getCouponId() {
         return couponId;
     }
-public void setCouponId(String couponId) {
+
+    public void setCouponId(String couponId) {
         this.couponId = couponId;
     }
-public String getUserName() {
+
+    public String getUserName() {
         return userName;
     }
-public void setUserName(String userName) {
+
+    public void setUserName(String userName) {
         this.userName = userName;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 
@@ -87,4 +102,12 @@ public void setObjType(String objType) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
 }

java110-bean/src/main/java/com/java110/po/couponDetail/CouponDetailPo.java

@@ -37,6 +37,7 @@ private String poolId;
 private String detailId;
 private String statusCd = "0";
 private String shopId;
+private String orderId;
 public String getBuyPrice() {
         return buyPrice;
     }
@@ -98,5 +99,11 @@ public void setShopId(String shopId) {
         this.shopId = shopId;
     }
 
+    public String getOrderId() {
+        return orderId;
+    }
 
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
 }

java110-bean/src/main/java/com/java110/po/couponShopPoolDetail/CouponShopPoolDetailPo.java

@@ -17,6 +17,7 @@ package com.java110.po.couponShopPoolDetail;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2021-11-24 00:17:18 mail: 928255095@qq.com
@@ -28,90 +29,120 @@ import java.util.Date;
 public class CouponShopPoolDetailPo implements Serializable {
 
     private String couponName;
-private String actualPrice;
-private String validityDay;
-private String detailId;
-private String statusCd = "0";
-private String sendCount;
-private String userName;
-private String spId;
-private String userId;
-private String poolId;
-private String tel;
-private String shopId;
-public String getCouponName() {
+    private String actualPrice;
+    private String validityDay;
+    private String detailId;
+    private String statusCd = "0";
+    private String sendCount;
+    private String userName;
+    private String spId;
+    private String userId;
+    private String poolId;
+    private String tel;
+    private String shopId;
+    private String orderId;
+
+    public String getCouponName() {
         return couponName;
     }
-public void setCouponName(String couponName) {
+
+    public void setCouponName(String couponName) {
         this.couponName = couponName;
     }
-public String getActualPrice() {
+
+    public String getActualPrice() {
         return actualPrice;
     }
-public void setActualPrice(String actualPrice) {
+
+    public void setActualPrice(String actualPrice) {
         this.actualPrice = actualPrice;
     }
-public String getValidityDay() {
+
+    public String getValidityDay() {
         return validityDay;
     }
-public void setValidityDay(String validityDay) {
+
+    public void setValidityDay(String validityDay) {
         this.validityDay = validityDay;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getSendCount() {
+
+    public String getSendCount() {
         return sendCount;
     }
-public void setSendCount(String sendCount) {
+
+    public void setSendCount(String sendCount) {
         this.sendCount = sendCount;
     }
-public String getUserName() {
+
+    public String getUserName() {
         return userName;
     }
-public void setUserName(String userName) {
+
+    public void setUserName(String userName) {
         this.userName = userName;
     }
-public String getSpId() {
+
+    public String getSpId() {
         return spId;
     }
-public void setSpId(String spId) {
+
+    public void setSpId(String spId) {
         this.spId = spId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getPoolId() {
+
+    public String getPoolId() {
         return poolId;
     }
-public void setPoolId(String poolId) {
+
+    public void setPoolId(String poolId) {
         this.poolId = poolId;
     }
-public String getTel() {
+
+    public String getTel() {
         return tel;
     }
-public void setTel(String tel) {
+
+    public void setTel(String tel) {
         this.tel = tel;
     }
-public String getShopId() {
+
+    public String getShopId() {
         return shopId;
     }
-public void setShopId(String shopId) {
+
+    public void setShopId(String shopId) {
         this.shopId = shopId;
     }
 
+    public String getOrderId() {
+        return orderId;
+    }
 
-
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
 }

java110-bean/src/main/java/com/java110/po/couponUserDetail/CouponUserDetailPo.java

@@ -35,7 +35,7 @@ private String couponId;
 private String userName;
 private String userId;
 private String objType;
-private String primary;
+private String orderId;
 public String getCouponName() {
         return couponName;
     }
@@ -84,13 +84,12 @@ public String getObjType() {
 public void setObjType(String objType) {
         this.objType = objType;
     }
-public String getPrimary() {
-        return primary;
-    }
-public void setPrimary(String primary) {
-        this.primary = primary;
-    }
-
 
+    public String getOrderId() {
+        return orderId;
+    }
 
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
 }

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

@@ -8,9 +8,9 @@
     <!-- 保存商家购买记录表信息 add by wuxw 2018-07-03 -->
     <insert id="saveCouponDetailInfo" parameterType="Map">
         insert into coupon_detail(
-        buy_price,coupon_name,amount,buy_count,actual_price,validity_day,pool_id,detail_id,shop_id
+        buy_price,coupon_name,amount,buy_count,actual_price,validity_day,pool_id,detail_id,shop_id,order_id
         ) values (
-        #{buyPrice},#{couponName},#{amount},#{buyCount},#{actualPrice},#{validityDay},#{poolId},#{detailId},#{shopId}
+        #{buyPrice},#{couponName},#{amount},#{buyCount},#{actualPrice},#{validityDay},#{poolId},#{detailId},#{shopId},#{orderId}
         )
     </insert>
 
@@ -20,7 +20,7 @@
         select t.buy_price,t.buy_price buyPrice,t.coupon_name,t.coupon_name couponName,t.amount,t.buy_count,t.buy_count
         buyCount,t.actual_price,t.actual_price actualPrice,t.validity_day,t.validity_day validityDay,t.pool_id,t.pool_id
         poolId,t.detail_id,t.detail_id detailId,t.status_cd,t.status_cd statusCd,t.shop_id,t.shop_id
-        shopId
+        shopId,t.order_id orderId
         from coupon_detail t
         where 1 =1
         <if test="buyPrice !=null and buyPrice != ''">
@@ -50,6 +50,9 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
         <if test="shopId !=null and shopId != ''">
             and t.shop_id= #{shopId}
         </if>
@@ -76,6 +79,9 @@
         <if test="amount !=null and amount != ''">
             , t.amount= #{amount}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            , t.order_id= #{orderId}
+        </if>
         <if test="buyCount !=null and buyCount != ''">
             , t.buy_count= #{buyCount}
         </if>
@@ -115,6 +121,9 @@
         <if test="buyCount !=null and buyCount != ''">
             and t.buy_count= #{buyCount}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
         <if test="actualPrice !=null and actualPrice != ''">
             and t.actual_price= #{actualPrice}
         </if>

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

@@ -20,8 +20,9 @@
         select t.buy_price,t.buy_price buyPrice,t.coupon_name,t.coupon_name couponName,t.coupon_stock,t.coupon_stock
         couponStock,t.actual_price,t.actual_price actualPrice,t.validity_day,t.validity_day
         validityDay,t.coupon_type,t.coupon_type couponType,t.pool_id,t.pool_id poolId,t.status_cd,t.status_cd
-        statusCd,t.state,t.seq
+        statusCd,t.state,t.seq,td.name couponTypeName
         from coupon_pool t
+        left join t_dict td on t.coupon_type  = td.status_cd and td.table_columns ='coupon_type' and td.table_name ='coupon_pool'
         where 1 =1
         <if test="buyPrice !=null and buyPrice != ''">
             and t.buy_price= #{buyPrice}
@@ -102,6 +103,7 @@
     <select id="queryCouponPoolsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from coupon_pool t
+        left join t_dict td on t.coupon_type  = td.status_cd and td.table_columns ='coupon_type' and td.table_name ='coupon_pool'
         where 1 =1
         <if test="buyPrice !=null and buyPrice != ''">
             and t.buy_price= #{buyPrice}

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

@@ -8,10 +8,10 @@
     <!-- 保存商家赠送记录信息 add by wuxw 2018-07-03 -->
     <insert id="saveCouponShopPoolDetailInfo" parameterType="Map">
         insert into coupon_shop_pool_detail(
-        coupon_name,actual_price,validity_day,detail_id,send_count,user_name,sp_id,user_id,pool_id,tel,shop_id
+        coupon_name,actual_price,validity_day,detail_id,send_count,user_name,sp_id,user_id,pool_id,tel,shop_id,order_id
         ) values (
         #{couponName},#{actualPrice},#{validityDay},#{detailId},#{sendCount},#{userName},#{spId},#{userId},
-        #{poolId},#{tel},#{shopId}
+        #{poolId},#{tel},#{shopId},#{orderId}
         )
     </insert>
 
@@ -21,7 +21,7 @@
         select t.coupon_name,t.coupon_name couponName,t.actual_price,t.actual_price
         actualPrice,t.validity_day,t.validity_day validityDay,t.detail_id,t.detail_id detailId,t.status_cd,t.status_cd
         statusCd,t.send_count,t.send_count sendCount,t.user_name,t.user_name userName,t.sp_id,t.sp_id
-        spId,t.user_id,t.user_id userId,t.pool_id,t.pool_id poolId,t.tel,t.shop_id,t.shop_id shopId
+        spId,t.user_id,t.user_id userId,t.pool_id,t.pool_id poolId,t.tel,t.shop_id,t.shop_id shopId,t.order_id orderId
         from coupon_shop_pool_detail t
         where 1 =1
         <if test="couponName !=null and couponName != ''">
@@ -36,6 +36,9 @@
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -92,6 +95,9 @@
         <if test="spId !=null and spId != ''">
             , t.sp_id= #{spId}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            , t.order_id= #{orderId}
+        </if>
         <if test="userId !=null and userId != ''">
             , t.user_id= #{userId}
         </if>
@@ -122,6 +128,9 @@
         <if test="actualPrice !=null and actualPrice != ''">
             and t.actual_price= #{actualPrice}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
         <if test="validityDay !=null and validityDay != ''">
             and t.validity_day= #{validityDay}
         </if>

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

@@ -8,9 +8,9 @@
     <!-- 保存用户抵消记录信息 add by wuxw 2018-07-03 -->
     <insert id="saveCouponUserDetailInfo" parameterType="Map">
         insert into coupon_user_detail(
-        coupon_name,uo_id,obj_id,coupon_id,user_name,user_id,obj_type
+        coupon_name,uo_id,obj_id,coupon_id,user_name,user_id,obj_type,order_id
         ) values (
-        #{couponName},#{uoId},#{objId},#{couponId},#{userName},#{userId},#{objType}
+        #{couponName},#{uoId},#{objId},#{couponId},#{userName},#{userId},#{objType},#{orderId}
         )
     </insert>
 
@@ -19,7 +19,7 @@
     <select id="getCouponUserDetailInfo" parameterType="Map" resultType="Map">
         select t.coupon_name,t.coupon_name couponName,t.uo_id,t.uo_id uoId,t.obj_id,t.obj_id
         objId,t.status_cd,t.status_cd statusCd,t.coupon_id,t.coupon_id couponId,t.user_name,t.user_name
-        userName,t.user_id,t.user_id userId,t.obj_type,t.obj_type objType
+        userName,t.user_id,t.user_id userId,t.obj_type,t.obj_type objType,t.order_id orderId
         from coupon_user_detail t
         where 1 =1
         <if test="couponName !=null and couponName != ''">
@@ -31,6 +31,9 @@
         <if test="objId !=null and objId != ''">
             and t.obj_id= #{objId}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -69,6 +72,9 @@
         <if test="couponId !=null and couponId != ''">
             , t.coupon_id= #{couponId}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            , t.order_id= #{orderId}
+        </if>
         <if test="userName !=null and userName != ''">
             , t.user_name= #{userName}
         </if>
@@ -96,6 +102,9 @@
         <if test="uoId !=null and uoId != ''">
             and t.uo_id= #{uoId}
         </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
         <if test="objId !=null and objId != ''">
             and t.obj_id= #{objId}
         </if>

service-acct/src/main/java/com/java110/acct/cmd/couponDetail/SaveCouponDetailCmd.java

@@ -54,6 +54,7 @@ public class SaveCouponDetailCmd extends AbstractServiceCmdListener {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+
         Assert.hasKeyAndValue(reqJson, "poolId", "请求报文中未包含poolId");
         Assert.hasKeyAndValue(reqJson, "shopId", "请求报文中未包含shopId");
         Assert.hasKeyAndValue(reqJson, "couponName", "请求报文中未包含couponName");