v1.1 payermax-查询chargeProd去掉paymentType条件

accompany-base/accompany-common/src/main/java/com/accompany/common/constant/Constant.java

@@ -5557,6 +5557,7 @@ public class Constant {
 
         public static final Byte first_charge = 3;
          // 自定义充值
+        public static final Byte payermax_h5 = 5;
         public static final Byte custom_charge = 12;
     }
 

accompany-base/accompany-payment/src/main/java/com/accompany/payment/model/ChargeProd.java

@@ -15,8 +15,6 @@ public class ChargeProd {
 
     private String payChannel;
 
-    private String paymentType;
-
     private Long money;
 
     private Integer changeGoldRate;
@@ -87,14 +85,6 @@ public class ChargeProd {
         this.payChannel = payChannel;
     }
 
-    public String getPaymentType() {
-        return paymentType;
-    }
-
-    public void setPaymentType(String paymentType) {
-        this.paymentType = paymentType;
-    }
-
     public Long getMoney() {
         return money;
     }

accompany-base/accompany-payment/src/main/java/com/accompany/payment/service/ChargeProdService.java

@@ -132,18 +132,13 @@ public class ChargeProdService {
         return chargeProdVoList;
     }
 
-    public List<ChargeProdVo> getAllChargeProdVoList(String countryCode, String payChannel, String paymentType) {
+    public List<ChargeProdVo> getAllChargeProdVoList(String countryCode, String payChannel) {
         BaseRequestVO baseRequestVO = new BaseRequestVO();
 
         ChargeProdExample chargeProdExample = new ChargeProdExample();
         chargeProdExample.createCriteria().andCountryEqualTo(countryCode)
                 .andPayChannelEqualTo(payChannel)
                 .andProdStatusIn(this.getAvailableChargeProdStatus());
-        if (StringUtils.isBlank(paymentType)) {
-            chargeProdExample.createCriteria().andPaymentTypeEqualIsNull();
-        } else {
-            chargeProdExample.createCriteria().andPaymentTypeEqualTo(paymentType);
-        }
 
         List<ChargeProd> chargeProds = chargeProdMapper.selectByExample(chargeProdExample);
         List<ChargeProd> chargeProdList = Lists.newArrayList();