@@ -16,10 +16,10 @@ public enum MchInfoEnum { | |||
**/ | |||
DEFAULT("默认子商户号", "https://api.weixin.qq.com", "https://api.mch.weixin.qq.com", "wxcb1388c809fe25a9", | |||
"wx008c60533388527a", "95197718b43b497f02732bd9f8011080","3B4BB93656582E38BFC6B16F1D09F68D0E111155", "1500877591", "1638682973", | |||
"beijingwuxiangancekejiyouxiangon", "beijingwuxiangancekejiyouxiangon", "D:\\qtzl\\其他文件\\1638682973\\"), | |||
"beijingwuxiangancekejiyouxiangon", "beijingwuxiangancekejiyouxiangon", "/data/mchFile/1638682973/"), | |||
YQ_MCH("莹沁渠道使用商户号", "https://api.weixin.qq.com", "https://api.mch.weixin.qq.com", "wxe5572b2938f35c09", | |||
"wx008c60533388527a", "95197718b43b497f02732bd9f8011080","6C4CDD524C06D107879C796BB5A234FA4401810B", "1641444218", "1648725759", | |||
"9901Etc99Etc99Etc99Etc99Etc99Etc", "99ETC99etc99etc99etc99etc99etc99", "D:\\qtzl\\其他文件\\1641444218\\"), | |||
"9901Etc99Etc99Etc99Etc99Etc99Etc", "99ETC99etc99etc99etc99etc99etc99", "/data/mchFile/1641444218/"), | |||
; | |||
/*** CODE*/ | |||
private final String description; |
@@ -23,6 +23,8 @@ import org.springframework.stereotype.Service; | |||
import javax.annotation.Resource; | |||
import javax.persistence.criteria.Predicate; | |||
import java.time.LocalDateTime; | |||
import java.time.format.DateTimeFormatter; | |||
import java.util.List; | |||
import java.util.stream.Collectors; | |||
@@ -94,7 +96,7 @@ public class FssPaccountPayQueryPageHandler extends AbstractAfterSalesManager<Fs | |||
List<Predicate> list = Lists.newArrayList(); | |||
list.add(cb.equal(root.<String>get("vehicleId"), request.getPlateNumber() + "_" + request.getPlateColor())); | |||
if (null != request.getStatus()) { | |||
list.add(cb.greaterThanOrEqualTo(root.<Integer>get("status"), request.getStatus())); | |||
list.add(cb.equal(root.<Integer>get("status"), request.getStatus())); | |||
} | |||
Predicate[] p = new Predicate[list.size()]; | |||
return cb.and(list.toArray(p)); | |||
@@ -137,4 +139,5 @@ public class FssPaccountPayQueryPageHandler extends AbstractAfterSalesManager<Fs | |||
payVo.setInsertTime(pay.getInserttime()); | |||
return payVo; | |||
} | |||
} |