Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSystemMiniController.java

@@ -9,17 +9,18 @@


import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.wx.WXUtil;

import org.yeshi.utils.wx.XCXKeFuUtil;



import com.yeshi.fanli.entity.system.CustomerContent;

import com.yeshi.fanli.entity.xcx.XCXSettingConfig;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.CustomerContentService;

import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.wx.WXUtil;

import org.yeshi.utils.wx.XCXKeFuUtil;



import net.sf.json.JSONObject;



@@ -32,6 +33,9 @@


   @Resource

   private ConfigService configService;

	
   @Resource

   private CustomerContentService customerContentService;



   /**

    * 

@@ -43,7 +47,7 @@
   @RequestMapping("contactCustomerService")

   public void contactCustomerService(PrintWriter out) {

      String title = "联系客服";

      List<CustomerContent> contentList = systemClientParamsService.contactCustomerService(title);

      List<CustomerContent> contentList = customerContentService.contactCustomerService(title);

      JSONObject data = new JSONObject();

      data.put("contentList", JsonUtil.getSimpleGsonWithDate().toJson(contentList));

      out.print(JsonUtil.loadTrueResult(data));