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..f8f3a01a9 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); @@ -487,7 +488,7 @@ public class RetailAppServiceImp implements RetailAppService { Date date = new Date(); couponAccuessLog.put("client_id", client_id); couponAccuessLog.put("order_id", "非平台订单"); - couponAccuessLog.put("coupon_id", coupon_id); + couponAccuessLog.put("coupon_id", "CTRIP_"+coupon_id); couponAccuessLog.put("customer_openid", "非平台订单"); couponAccuessLog.put("coupon_deal_amount", 0); couponAccuessLog.put("currency", "AUD"); 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 6aa29ddaa..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,6 +29,5 @@ public interface CouponAccuessLogMapper { @AutoSql(type = SqlType.SELECT) List findCouponByOrderId(@Param("order_id") String order_id); - @AutoSql(type = SqlType.SELECT) - 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/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 5bae8cc26..030aa8148 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -3779,7 +3779,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid ctx.setVariable("name", client.getString("contact_person")); ctx.setVariable("order_id", order.getString("order_id")); ctx.setVariable("amount", order.getString("total_amount")); - ctx.setVariable("time", order.getString("create_time")); + String create_time = DateFormatUtils.format(order.getDate("create_time"), "yyyy-MM-dd HH:mm:ss"); + ctx.setVariable("time", create_time); final String content = thymeleaf.process( "mail/hf_email_notice", ctx); final String mailTo = client.getString("contact_email"); if (StringUtils.isEmpty(mailTo)) { 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 new file mode 100644 index 000000000..784d34e3b --- /dev/null +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/mail/hf_email_notice.html b/src/main/resources/templates/mail/hf_email_notice.html index f0059fbf0..d7f5e6275 100644 --- a/src/main/resources/templates/mail/hf_email_notice.html +++ b/src/main/resources/templates/mail/hf_email_notice.html @@ -15,6 +15,7 @@

RoyalPay到账提醒:

    +
  • 支付渠道:汇付
  • 订单编号:
  • 收款金额:
  • 到账时间: