|
|
|
@ -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<JSONObject> 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<String, JSONObject> couponMap = new HashMap<>();
|
|
|
|
|
for(JSONObject cusCouponLog : cusCouponLogs) {
|
|
|
|
|
cusCouponLog.put("client_moniker", client_moniker);
|
|
|
|
|