添加了获取质保卡信息的接口

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/warrantyCard/WarrantyCard.java

@@ -1,5 +1,7 @@
 package com.iamberry.wechat.core.entity.warrantyCard;
 
+import com.iamberry.wechat.core.entity.PageBean;
+
 import java.util.Date;
 
 /**
@@ -24,6 +26,15 @@ public class WarrantyCard implements java.io.Serializable {
     private String cardCity;            //市
     private String cardDistrict;        //区
     private Integer cardTypeState;      //状态 1：使用中，2：停用
+    private PageBean page = new PageBean();		//分页
+
+    public PageBean getPage() {
+        return page;
+    }
+
+    public void setPage(PageBean page) {
+        this.page = page;
+    }
 
     public Integer getProductType() {
         return productType;

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/warranty/WarrantyService.java

@@ -1,6 +1,9 @@
 package com.iamberry.wechat.face.warranty;
 
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard;
+
+import java.util.List;
 
 /**
  * Created by liuzhiwei on 2017/12/21.
@@ -8,6 +11,13 @@ import com.iamberry.wechat.core.entity.member.Member;
 public interface WarrantyService {
 
     /**
+     * 查询质保卡集合
+     * @param warrantyCard
+     * @return
+     */
+    List<WarrantyCard> listWarrantyCard(WarrantyCard warrantyCard);
+
+    /**
      * 批量添加质保卡信息
      * @param txtOrderId
      * @return

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/warrantyMapper.xml

@@ -15,10 +15,17 @@
             <if test="userOpenId != null and userOpenId != ''">
                 user_open_id = #{userOpenId}
             </if>
+            <if test="cardTypeState != null and cardTypeState != ''">
+              AND card_type_state = #{cardTypeState}
+            </if>
             <if test="cardSalesTime != null">
                 AND card_sales_time = #{cardSalesTime}
             </if>
         </where>
+        order by card_id DESC
+        <if test="page!=null and page.pageSize>0 ">
+            LIMIT ${page.recordBegin},${page.pageSize}
+        </if>
     </select>
 
     <!-- 批量添加质保卡信息 -->

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/warranty/WarrantyServiceImpl.java

@@ -134,4 +134,9 @@ public class WarrantyServiceImpl implements WarrantyService {
         calendar.add(Calendar.MONTH, month);
         return calendar.getTime();
     }
+
+    @Override
+    public List<WarrantyCard> listWarrantyCard(WarrantyCard warrantyCard) {
+        return warrantyMapper.listWarrantyCard(warrantyCard);
+    }
 }

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/warranty/WarrantyCardHandler.java

@@ -5,6 +5,7 @@ import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.phone.PhoneCodeService;
 import com.iamberry.wechat.face.warranty.WarrantyService;
@@ -23,6 +24,7 @@ import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -30,6 +32,7 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -51,6 +54,31 @@ public class WarrantyCardHandler {
     @Autowired
     private WarrantyService warrantyService;
 
+
+    /**
+     * 查询个人质保卡集合信息
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/select_warranty_list")
+    public ResultMsg selectWarrantyList(HttpServletRequest request) throws Exception {
+        ResultMsg msg = new ResultMsg();
+        WarrantyCard card = new WarrantyCard();
+        Member member  = wechatUtils.getUserBySession(request);
+        card.setUserOpenId(member.getUserOpenid());
+        card.setCardTypeState(1);
+        card.setPage(null);
+
+        //查询质保卡集合
+        List<WarrantyCard> cardList = warrantyService.listWarrantyCard(card);
+        msg.setData(cardList);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        return msg;
+    }
+
     /**
      * 根据电话号码查询百胜订单信息
      * @param request

iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/imagetext/oneimagetext.jsp

@@ -216,6 +216,9 @@ String basePath = path + "/common/";
 				editor.plugin.imageDialog({
 					imageUrl : K('#imageUrl').val(),
 					clickFn : function(url, title, width, height, border, align) {
+					    if (url.indexOf("http://h5.iamberry.com") > -1) {
+                            url.replace("http://h5.iamberry.com","");
+						}
 						K('#imageUrl').val(url);
 						//将图片回显到左侧的样板上
 						$("#imageReturn").attr("src", url);