From af40eff1b5a033ce190e2c31f5c02f9adc90376f Mon Sep 17 00:00:00 2001 From: luoyang14z7 <704328506@qq.com> Date: Fri, 13 Jul 2018 14:03:39 +0800 Subject: [PATCH 1/4] fix : ActChairty --- .../ui/static/actchairty/templates/act_chairty_merchants.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html index b08680a38..b928a00ab 100644 --- a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html +++ b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html @@ -74,7 +74,11 @@ next-text="›" first-text="«" last-text="»"> +
+
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+
+ From 77bb3ea3b5220d030a453374aafac0b7b50aabe5 Mon Sep 17 00:00:00 2001 From: eason Date: Fri, 13 Jul 2018 14:08:19 +0800 Subject: [PATCH 2/4] fix actChairty --- .../royalpay/payment/manage/mappers/act/ActChairtyMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml index a958486dd..addc41843 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml @@ -6,7 +6,7 @@ from act_charity left JOIN pmt_transactions on act_charity.client_id = pmt_transactions.client_id and pmt_transactions.transaction_type='Credit' and pmt_transactions.transaction_time>=act_charity.active_time - and pmt_transactions.transaction_time<'2018-09-01' + and pmt_transactions.transaction_time<'2018-09-01' and pmt_transactions.transaction_time>='2018-07-09' and pmt_transactions.channel != 'Settlement' GROUP BY act_charity.client_id order by count_ordernum desc @@ -14,6 +14,7 @@ select count(DISTINCT order_id) as count_ordernum,date_format(pmt_transactions.transaction_time,'%Y-%m-%d') as orderdate,client_moniker,ifnull(sum(pmt_transactions.clearing_amount),0) as sum_ordernum from act_charity inner JOIN pmt_transactions ON act_charity.client_id = pmt_transactions.client_id and pmt_transactions.transaction_type='Credit' and pmt_transactions.transaction_time>=#{begin} and pmt_transactions.transaction_time<=#{end} and pmt_transactions.transaction_time>=act_charity.active_time and pmt_transactions.channel != 'Settlement' + and pmt_transactions.transaction_time<'2018-09-01' and pmt_transactions.transaction_time>='2018-07-09' group by date_format(pmt_transactions.transaction_time,'%Y-%m-%d') @@ -21,6 +22,7 @@ \ No newline at end of file From 4f596ec1d330cf96e83e67658e9cb1e1aca75da5 Mon Sep 17 00:00:00 2001 From: luoyang14z7 <704328506@qq.com> Date: Fri, 13 Jul 2018 16:56:16 +0800 Subject: [PATCH 3/4] fix : ActChairty --- src/main/ui/static/actchairty/act_chairty.js | 6 ++++-- .../static/actchairty/templates/act_chairty_merchants.html | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/actchairty/act_chairty.js b/src/main/ui/static/actchairty/act_chairty.js index 4cd8fc7ef..3f9294646 100644 --- a/src/main/ui/static/actchairty/act_chairty.js +++ b/src/main/ui/static/actchairty/act_chairty.js @@ -29,15 +29,17 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul $scope.new_conf = {}; $scope.ctrl = {dateInput: false}; $scope.submitClient = function () { - $scope.errmsg = null; + var client_moniker = $scope.new_conf.client_moniker; + $scope.msg = null; var conf = { date: $filter('date')($scope.new_conf.date, 'yyyy-MM-dd'), }; $http.put('/actchairty/clients/' + $scope.new_conf.client_moniker, conf).then(function () { $scope.new_conf = {}; $scope.loadClients(); + $scope.msg = "商户创建成功！商户ID："+ client_moniker + " 参加时间:" + conf.date; }, function (resp) { - $scope.errmsg = resp.data.message; + $scope.msg = resp.data.message; }); }; }]); diff --git a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html index b928a00ab..4893f4e50 100644 --- a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html +++ b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html @@ -23,7 +23,7 @@
-
+
From de82418d700fc740aa0b755e96b78e56bbc83304 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Fri, 13 Jul 2018 18:44:23 +0800 Subject: [PATCH 4/4] encourage money --- .../web/EncourageMoneyController.java | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java index 6aa15d077..e7547971c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java @@ -2,10 +2,17 @@ package au.com.royalpay.payment.manage.customers.web; import au.com.royalpay.payment.manage.customers.core.EncourageService; import au.com.royalpay.payment.tools.CommonConsts; -import au.com.royalpay.payment.tools.connections.mpsupport.beans.WxOauthType; -import au.com.royalpay.payment.tools.permission.wechat.WechatMapping; + import com.alibaba.fastjson.JSONObject; -import org.springframework.web.bind.annotation.*; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; @@ -16,15 +23,22 @@ import javax.annotation.Resource; @RestController @RequestMapping("/act/encourage_money") public class EncourageMoneyController { + Logger logger = LoggerFactory.getLogger(getClass()); @Resource private EncourageService encourageService; - @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.PUT) - public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser) { - if (wxUser == null) { + @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.GET) + public JSONObject takeEncourageMoney(@PathVariable String orderId,@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) { + String user_id = ""; + if(wxUser==null){ + user_id = aliuser.getString("user_id"); + }else { + user_id = wxUser.getString("openid"); + } + if(StringUtils.isEmpty(user_id)){ return new JSONObject(); } - return encourageService.takeEncourageMoney(orderId, wxUser.getString("openid")); + return encourageService.takeEncourageMoney(orderId, user_id); } @RequestMapping(value = "/orders/{orderId}/crit", method = RequestMethod.PUT) @@ -32,21 +46,27 @@ public class EncourageMoneyController { return encourageService.doubleEncourageMoney(orderId); } - @WechatMapping(value = "/my", method = RequestMethod.GET, oauthType = WxOauthType.USERINFO) - public ModelAndView encourageLogs(@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser) { + @RequestMapping(value = "/my", method = RequestMethod.GET) + public ModelAndView encourageLogs(@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) { ModelAndView mav = new ModelAndView("activity/encourage_money/my"); mav.addObject("wxUser", wxUser); - JSONObject balanceStatus = encourageService.getBalanceStatus(wxUser.getString("openid")); + String user_id = ""; + if(wxUser==null){ + user_id = aliuser.getString("user_id"); + }else { + user_id = wxUser.getString("openid"); + } + JSONObject balanceStatus = encourageService.getBalanceStatus(user_id); mav.addObject("balance_status", balanceStatus); return mav; } - @WechatMapping(value = "/desc",method = RequestMethod.GET) + @RequestMapping(value = "/desc",method = RequestMethod.GET) public ModelAndView descPage(){ return new ModelAndView("activity/encourage_money/desc"); } - @WechatMapping(value = "/merchants",method = RequestMethod.GET) + @RequestMapping(value = "/merchants",method = RequestMethod.GET) public ModelAndView merchantsPage(){ return new ModelAndView("activity/encourage_money/merchants"); }