diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
index 1706ade3a..3236e16dc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
@@ -120,9 +120,9 @@ public interface RetailAppService {
void useCoupon(JSONObject device, String coupon_log_id);
- JSONObject getAd(JSONObject device);
+ JSONObject getAd();
- JSONObject getAdDetail(JSONObject device, String article_id);
+ JSONObject getAdDetail(String article_id);
JSONObject getCheckClientInfo(JSONObject device);
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 c441fcd24..ea563e6ee 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
@@ -1770,23 +1770,34 @@ public class RetailAppServiceImp implements RetailAppService {
}
@Override
- public JSONObject getAd(JSONObject device) {
- String clientType = device.getString("client_type");
- deviceSupport.findRegister(clientType);
+ public JSONObject getAd() {
JSONObject res = royalPayCMSSupport.listArticles("app_ad", false, true, 1, 10);
JSONArray acts = res.getJSONArray("data");
if (acts.size() > 0) {
int selectNo = RandomUtils.nextInt(0, acts.size());
- return acts.getJSONObject(selectNo);
+ JSONObject getActs = acts.getJSONObject(selectNo);
+ getActs.put("ad_cover", getActs.getString("page_desc"));
+ getActs.put("ad_mode", getActs.getString("page_keywords"));
+ getActs.put("ad_link", getActs.getString("summery"));
+ getActs.put("publish_date", DateFormatUtils.format(getActs.getDate("publish_time"),"yyyy/MM/dd HH:mm:ss"));
+ String reference = getActs.getString("reference");
+ JSONObject referenceObj = JSONObject.parseObject(reference);
+ getActs.put("ad_type", referenceObj.getString("ad_type"));
+ getActs.put("expire_date", referenceObj.getString("expire_date"));
+ getActs.put("duration_time", referenceObj.getString("duration_time"));
+ getActs.remove("reference");
+ getActs.remove("page_desc");
+ getActs.remove("page_keywords");
+ getActs.remove("summery");
+ getActs.remove("publish_time");
+ return getActs;
}
return null;
}
@Override
- public JSONObject getAdDetail(JSONObject device, String article_id) {
- String clientType = device.getString("client_type");
- deviceSupport.findRegister(clientType);
+ public JSONObject getAdDetail(String article_id) {
JSONObject res = royalPayCMSSupport.getArticle("app_ad", article_id);
Document doc = Jsoup.parse(res.getString("content"));
String father = "";
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 00f5b7ce9..d8cf99f17 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
@@ -395,19 +395,6 @@ public class RetailAppController {
}
/* 优惠券End */
- /**
- * 广告位
- */
- @RequestMapping(value = "/ads", method = RequestMethod.GET)
- public JSONObject getAd(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
- return retailAppService.getAd(device);
- }
-
- @RequestMapping(value = "/ads/{article_id}", method = RequestMethod.GET)
- public JSONObject getAdDetail(@PathVariable String article_id, @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
- return retailAppService.getAdDetail(device, article_id);
- }
-
@RequestMapping(value = "/bills/{bill_id}", method = RequestMethod.GET)
public JSONObject getBill(@PathVariable("bill_id") String bill_id, @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
return billService.getBillDetail(bill_id, device.getIntValue("client_id"));
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
index d00114502..5194f557a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
@@ -1,7 +1,9 @@
package au.com.royalpay.payment.manage.appclient.web;
import au.com.royalpay.payment.manage.appclient.beans.RetailLoginInfo;
+import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
import au.com.royalpay.payment.manage.signin.core.SignInStatusManager;
+import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.device.DeviceSupport;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.http.HttpUtils;
@@ -32,6 +34,8 @@ public class RetailValidationController {
private SignInStatusManager signInStatusManager;
@Resource
private DeviceSupport deviceSupport;
+ @Resource
+ private RetailAppService retailAppService;
@RequestMapping(value = "/devices/{devType}/register", method = RequestMethod.POST)
public JSONObject register(@RequestBody String registeration, @PathVariable String devType) {
@@ -91,4 +95,17 @@ public class RetailValidationController {
}
return res;
}
+
+ /**
+ * 广告位
+ */
+ @RequestMapping(value = "/ads", method = RequestMethod.GET)
+ public JSONObject getAd() {
+ return retailAppService.getAd();
+ }
+
+ @RequestMapping(value = "/ads/{article_id}", method = RequestMethod.GET)
+ public JSONObject getAdDetail(@PathVariable String article_id) {
+ return retailAppService.getAdDetail( article_id);
+ }
}
diff --git a/src/main/ui/static/cms/cms.js b/src/main/ui/static/cms/cms.js
index 2c6363284..09a9e5eae 100644
--- a/src/main/ui/static/cms/cms.js
+++ b/src/main/ui/static/cms/cms.js
@@ -109,6 +109,7 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
app.controller('cmsAddArticleCtrl', ['$scope', '$http', '$state', '$stateParams', 'commonDialog', function ($scope, $http, $state, $stateParams, commonDialog) {
$scope.saveArticle = function () {
+ $scope.article.reference =$scope.reference;
$http.post('/app/cms/categories/' + $stateParams.catId + '/articles', $scope.article).then(function (resp) {
$state.go('^.article_view', {articleId: resp.data.article_id});
}, function (resp) {
@@ -119,7 +120,10 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
app.controller('cmsArticleEditCtrl', ['$scope', '$http', '$state', '$stateParams', 'commonDialog', 'article', function ($scope, $http, $state, $stateParams, commonDialog, article) {
$scope.article = article.data;
+ $scope.reference = JSON.parse($scope.article.reference);
+
$scope.saveArticle = function () {
+ $scope.article.reference =$scope.reference;
$http.put('/app/cms/categories/' + $stateParams.catId + '/articles/' + $stateParams.articleId, $scope.article).then(function (resp) {
$state.go('^.article_view', {articleId: $stateParams.articleId});
}, function (resp) {
diff --git a/src/main/ui/static/cms/templates/article_editor.html b/src/main/ui/static/cms/templates/article_editor.html
index 0ead12acb..7c9cd1bf5 100644
--- a/src/main/ui/static/cms/templates/article_editor.html
+++ b/src/main/ui/static/cms/templates/article_editor.html
@@ -20,7 +20,7 @@
-
(重要！！！0：不允许跳转 1：跳转编辑内容 2：跳转到外链)
+
(重要！！！0：不允许跳转 1：跳转到外链)
-
+
+
+