发票

src/main/java/com/dk/oauth/entity/TradeResponse.java

@@ -196,4 +196,11 @@ public class TradeResponse   {
     private String receiptStatusName;
     @ApiModelProperty(value = "开票标识")
     private String receiptStatus;
+
+    /**
+     * 优惠券名称
+     */
+    @Excel(name = "优惠券名称")
+    @ApiModelProperty(value = "优惠券名称")
+    private String couponName;
 }

src/main/java/com/dk/oauth/model/pojo/Receipt.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -178,9 +179,9 @@ public class Receipt extends PageInfo<Receipt> implements Serializable {
      */
     @Excel(name = "开票日期")
     @ApiModelProperty(value = "开票日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime receiptDate;
+    private LocalDate receiptDate;
 
 
     /**

src/main/java/com/dk/oauth/model/pojo/ReceiptSet.java

@@ -196,6 +196,8 @@ public class ReceiptSet extends PageInfo<ReceiptSet> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @TableField(exist = false)
+    private String searchText;
 
     /*
      * 相关属性

src/main/java/com/dk/oauth/response/ReceiptResponse.java

@@ -17,11 +17,12 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
- *  计量单位
+ * 计量单位
  */
 @Data
 @AllArgsConstructor
@@ -29,8 +30,8 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @ExportTitle("发票管理")
 @TableName(value = "t_mst_receipt", autoResultMap = true)
-@ApiModel(value="实体类：发票管理", description="表名：t_mst_receipt")
-public class ReceiptResponse    implements Serializable {
+@ApiModel(value = "实体类：发票管理", description = "表名：t_mst_receipt")
+public class ReceiptResponse implements Serializable {
     /*
      * 数据库字段
      */
@@ -176,12 +177,12 @@ public class ReceiptResponse    implements Serializable {
     /**
      * 开票日期
      */
+
     @Excel(name = "开票日期")
     @ApiModelProperty(value = "开票日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime receiptDate;
-
+    private LocalDate receiptDate;
 
     /**
      * 开票人

src/main/resources/mapper/ReceiptMapper.xml

@@ -30,10 +30,10 @@
                 <result column="cp_phone" property="cpPhone"/>
                 <result column="open_bank" property="openBank"/>
                 <result column="bank_account" property="bankAccount"/>
-               <result column="receiptTypeName" property="receiptTypeName"/>
+                <result column="receiptTypeName" property="receiptTypeName"/>
                 <result column="receipt_amt" property="receiptAmt"/>
                 <result column="receipt_content" property="receiptContent"/>
-            <result column="receipt_date" property="receiptDate" typeHandler="TimestampTypeHandler"/>
+                <result column="receipt_date" property="receiptDate"  typeHandler="TimestampTypeHandler"/>
                 <result column="receipt_staff" property="receiptStaff"/>
                 <result column="receipt_obj" property="receiptObj"/>
                 <result column="tax_rate" property="taxRate"/>

src/main/resources/mapper/ReceiptSetMapper.xml

@@ -89,6 +89,10 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
+            <if test="searchText !=null">
+                AND   (cp_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                or tax_no LIKE concat('%', my_ex.likequery(#{searchText}), '%'))
+            </if>
         </where>
     </sql>
 

src/main/resources/mapper/TradeMapper.xml

@@ -27,6 +27,9 @@
         ,t.trade_desc
         ,t.activity_ids
         ,t.activity_item_ids
+        ,t.integral
+        ,t.coupon_use_id
+        ,t.staff_name
     </sql>
 
     <resultMap type="com.dk.oauth.entity.Trade" id="ResultMap">
@@ -83,6 +86,7 @@
         <result column="receiptStatusName" property="receiptStatusName"/>
         <result column="integral" property="integral"/>
         <result column="staff_name" property="staffName"/>
+        <result column="coupon_name" property="couponName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -99,7 +103,12 @@
                 AND t.trade_status = #{tradeStatus}
             </if>
             <if test="receiptStatus != null and receiptStatus != ''">
-                AND t.receipt_status = #{receiptStatus}
+                <if test="receiptStatus == '开票状态-未开票'">
+                    AND (t.receipt_status = #{receiptStatus} OR t.receipt_status IS NULL)
+                </if>
+                <if test="receiptStatus != '开票状态-未开票'">
+                    AND t.receipt_status = #{receiptStatus}
+                </if>
             </if>
             <if test="tradeNo != null and tradeNo != ''">
                 AND t.trade_no = #{tradeNo}
@@ -144,11 +153,13 @@
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n} ) AS "tradeTypeName"
         ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n} ) AS "tradeStatusName"
         ,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n} ) AS "receiptStatusName"
+        ,tmc.coupon_name
         FROM dkic_a.t_cp_trade t
         left join sys.t_grade g on t.buy_grade_code = g.grade_code
         LEFT JOIN sys.t_data_kind tdk1 ON tdk1.kind_code = t.trade_type
         LEFT JOIN sys.t_data_kind tdk2 ON tdk2.kind_code = t.trade_status
         LEFT JOIN sys.t_data_kind tdk3 ON tdk3.kind_code = t.receipt_status
+        LEFT JOIN dkic_a.t_mst_coupon tmc ON tmc.coupon_id = t.coupon_use_id
         <include refid="Condition"/>
         order by t.trade_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">