diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 8ad7cf913..a6f4b413e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -457,12 +457,13 @@ public class RetailAppServiceImp implements RetailAppService { @Override public JSONObject getCouponCusCouponLog(String client_moniker, AppQueryBean appQueryBean) { + String keyword = "CTRIP_"; JSONObject client = clientMapper.findClientByMoniker(client_moniker); if (client == null) { throw new BadRequestException("Partner not exists"); } PageList cusCouponLogs = couponAccuessLogMapper.getCouponAccuessLog( - client.getIntValue("client_id"), new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit(), Order.formString("creation_date.desc"))); + client.getIntValue("client_id"), keyword, new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit(), Order.formString("creation_date.desc"))); HashMap couponMap = new HashMap<>(); for(JSONObject cusCouponLog : cusCouponLogs) { cusCouponLog.put("client_moniker", client_moniker); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java index 47c263358..8f62c7c2b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java @@ -29,5 +29,5 @@ public interface CouponAccuessLogMapper { @AutoSql(type = SqlType.SELECT) List findCouponByOrderId(@Param("order_id") String order_id); - PageList getCouponAccuessLog(@Param("client_id")int client_id, PageBounds pageBounds); + PageList getCouponAccuessLog(@Param("client_id")int client_id, @Param("keyword")String keyword, PageBounds pageBounds); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml index 2764151fd..784d34e3b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml @@ -4,10 +4,10 @@ \ No newline at end of file