java110 лет назад: 3
Родитель
Сommit
ca2e319c7f

+ 20 - 0
java110-bean/src/main/java/com/java110/dto/parkingCouponOrder/ParkingCouponOrderDto.java

@@ -36,6 +36,10 @@ public class ParkingCouponOrderDto extends PageDto implements Serializable {
 
 
     private String payType;
     private String payType;
 
 
+    private String payTypeName;
+
+    private String couponName;
+
 
 
     public String getQuantity() {
     public String getQuantity() {
         return quantity;
         return quantity;
@@ -165,4 +169,20 @@ public class ParkingCouponOrderDto extends PageDto implements Serializable {
     public void setPayType(String payType) {
     public void setPayType(String payType) {
         this.payType = payType;
         this.payType = payType;
     }
     }
+
+    public String getPayTypeName() {
+        return payTypeName;
+    }
+
+    public void setPayTypeName(String payTypeName) {
+        this.payTypeName = payTypeName;
+    }
+
+    public String getCouponName() {
+        return couponName;
+    }
+
+    public void setCouponName(String couponName) {
+        this.couponName = couponName;
+    }
 }
 }

+ 3 - 1
java110-db/src/main/resources/mapper/acct/ParkingCouponOrderV1ServiceDaoImplMapper.xml

@@ -21,8 +21,10 @@
         shopName,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,t.status_cd,t.status_cd
         shopName,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,t.status_cd,t.status_cd
         statusCd,t.received_amount,t.received_amount receivedAmount,t.coupon_id,t.coupon_id
         statusCd,t.received_amount,t.received_amount receivedAmount,t.coupon_id,t.coupon_id
         couponId,t.price,t.pa_id,t.pa_id paId,t.community_name,t.community_name communityName,t.shop_id,t.shop_id
         couponId,t.price,t.pa_id,t.pa_id paId,t.community_name,t.community_name communityName,t.shop_id,t.shop_id
-        shopId,t.community_id,t.community_id communityId,t.pay_type payType
+        shopId,t.community_id,t.community_id communityId,t.pay_type payType,pc.`name` couponName,td.name payTypeName
         from parking_coupon_order t
         from parking_coupon_order t
+        left join parking_coupon pc on t.coupon_id = pc.coupon_id and pc.status_cd = '0'
+        left join t_dict td on t.pay_type = td.status_cd and td.table_name = 'parking_coupon_order' and td.table_columns = 'pay_type'
         where 1 =1
         where 1 =1
         <if test="quantity !=null and quantity != ''">
         <if test="quantity !=null and quantity != ''">
             and t.quantity= #{quantity}
             and t.quantity= #{quantity}