修改嗲吗

hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrder.java

@@ -22,9 +22,6 @@ public class ExportOutRechargeOrder {
     @ExcelProperty("充值内容")
     private String rechargeContent;
 
-    @ExcelProperty("中石油持卡人姓名")
-    private String rechargeName;
-
     @ExcelProperty("备注")
     private String remarks;
 
@@ -107,14 +104,6 @@ public class ExportOutRechargeOrder {
         this.rechargeContent = rechargeContent;
     }
 
-    public String getRechargeName() {
-        return rechargeName;
-    }
-
-    public void setRechargeName(String rechargeName) {
-        this.rechargeName = rechargeName;
-    }
-
     public String getRemarks() {
         return remarks;
     }

hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java

@@ -64,12 +64,12 @@ public interface OutRechargeOrderMapperExt {
                    " a.order_no orderNo," +
                    " a.user_name userName," +
                    " a.user_phone userPhone," +
-                   " case a.recharge_model when 1 then '话费充值' when 2 then '中石化' when 3 then '中石油' end rechargeModelName," +
+                   " case a.recharge_model when 1 then '电信话费' when 2 then '移动话费' when 3 then '联通话费' end rechargeModelName," +
                    " a.recharge_content rechargeContent," +
                    " a.recharge_name rechargeName," +
                    " a.id_card rechargeIdCard," +
                    " a.remarks remarks," +
-                   " case a.pay_type when 1 then '微信' end payTypeName," +
+                   " case a.pay_type when 1 then '微信' when 2 then '工会卡' when 3 then '积分' end payTypeName," +
                    " a.order_price orderPrice," +
                    " a.pay_price payPrice," +
                    " a.pay_real_price payRealPrice," +