From a1a54931a3ab5fdb9fb42340eab647610c04a60a Mon Sep 17 00:00:00 2001 From: yangkai Date: Fri, 31 Aug 2018 12:04:51 +0800 Subject: [PATCH] =?UTF-8?q?Ctrip=E5=8D=A1=E5=88=B8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 5 +++-- .../payment/manage/appclient/web/RetailAppController.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 1efb6cd7c..77e6022e6 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 @@ -471,14 +471,15 @@ public class RetailAppServiceImp implements RetailAppService { throw new BadRequestException("Partner not exists"); } JSONObject couponAccuessLog = new JSONObject(); + Date date = new Date(); couponAccuessLog.put("client_id", client_id); couponAccuessLog.put("order_id", "非平台订单"); couponAccuessLog.put("coupon_id", coupon_id); couponAccuessLog.put("customer_openid", "非平台订单"); couponAccuessLog.put("coupon_deal_amount", 0); couponAccuessLog.put("currency", "AUD"); - couponAccuessLog.put("creation_date", new Date()); - couponAccuessLog.put("last_update_date", new Date()); + couponAccuessLog.put("creation_date", date); + couponAccuessLog.put("last_update_date", date); couponAccuessLog.put("is_valid", 1); couponAccuessLogMapper.save(couponAccuessLog); } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index 524fcb020..003e7b8ca 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -569,8 +569,8 @@ public class RetailAppController { return retailAppService.getCouponCusCouponLog(client_moniker, appQueryBean); } - @RequestMapping(value = "/cus/coupon_accuess_log/{client_id}/save", method = RequestMethod.POST) - public void saveCouponAccuessLog(@PathVariable int client_id, @RequestParam String coupon_id) { + @RequestMapping(value = "/cus/coupon_accuess_log/{coupon_id}", method = RequestMethod.POST) + public void saveCouponAccuessLog(@PathVariable String coupon_id, @RequestParam int client_id) { retailAppService.saveCouponAccuessLog(client_id, coupon_id); }