添加了注册会员方法

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/apparatus/Apparatus.java

@@ -15,11 +15,38 @@ public class Apparatus implements java.io.Serializable{
     private Integer apparatusId;        //id
     private String apparatusBarcode;    //机器条码
     private String userOpenid;          //用户openid
+    private Integer storeId;            //渠道id
     private Integer apparatusStatus;    //状态
+    private Date apparatusBuyDate;      //购买时间
+    private Date apparatusWarrantyDate; //保修截止日期
     private Date apparatusCreateTime;   //创建时间
 
     private PageBean page;			//分页
 
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Date getApparatusBuyDate() {
+        return apparatusBuyDate;
+    }
+
+    public void setApparatusBuyDate(Date apparatusBuyDate) {
+        this.apparatusBuyDate = apparatusBuyDate;
+    }
+
+    public Date getApparatusWarrantyDate() {
+        return apparatusWarrantyDate;
+    }
+
+    public void setApparatusWarrantyDate(Date apparatusWarrantyDate) {
+        this.apparatusWarrantyDate = apparatusWarrantyDate;
+    }
+
     public PageBean getPage() {
         return page;
     }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/member/MemberIntegral.java

@@ -0,0 +1,94 @@
+package com.iamberry.wechat.core.entity.member;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 会员积分表
+ * Created by liuzhiwei on 2017/12/29.
+ */
+public class MemberIntegral implements Serializable {
+
+    private static final long serialVersionUID = -2581070161725499643L;
+    private Integer memberId;               //会员ID
+    private Integer rankRuleId;             //等级ID
+    private String userOpenid;              //用户openId
+    private Integer memberStatus;           //状态
+    private Integer memberAllIntegral;      //总积分
+    private Integer memberSurplusIntegral;  //剩余积分
+    private Integer memberUsedIntegral;     //已用积分
+    private Date memberCreateTime;          //创建时间
+    private Date memberUpdateTime;          //更新时间
+
+    public Integer getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Integer memberId) {
+        this.memberId = memberId;
+    }
+
+    public Integer getRankRuleId() {
+        return rankRuleId;
+    }
+
+    public void setRankRuleId(Integer rankRuleId) {
+        this.rankRuleId = rankRuleId;
+    }
+
+    public String getUserOpenid() {
+        return userOpenid;
+    }
+
+    public void setUserOpenid(String userOpenid) {
+        this.userOpenid = userOpenid;
+    }
+
+    public Integer getMemberStatus() {
+        return memberStatus;
+    }
+
+    public void setMemberStatus(Integer memberStatus) {
+        this.memberStatus = memberStatus;
+    }
+
+    public Integer getMemberAllIntegral() {
+        return memberAllIntegral;
+    }
+
+    public void setMemberAllIntegral(Integer memberAllIntegral) {
+        this.memberAllIntegral = memberAllIntegral;
+    }
+
+    public Integer getMemberSurplusIntegral() {
+        return memberSurplusIntegral;
+    }
+
+    public void setMemberSurplusIntegral(Integer memberSurplusIntegral) {
+        this.memberSurplusIntegral = memberSurplusIntegral;
+    }
+
+    public Integer getMemberUsedIntegral() {
+        return memberUsedIntegral;
+    }
+
+    public void setMemberUsedIntegral(Integer memberUsedIntegral) {
+        this.memberUsedIntegral = memberUsedIntegral;
+    }
+
+    public Date getMemberCreateTime() {
+        return memberCreateTime;
+    }
+
+    public void setMemberCreateTime(Date memberCreateTime) {
+        this.memberCreateTime = memberCreateTime;
+    }
+
+    public Date getMemberUpdateTime() {
+        return memberUpdateTime;
+    }
+
+    public void setMemberUpdateTime(Date memberUpdateTime) {
+        this.memberUpdateTime = memberUpdateTime;
+    }
+}

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/apparatus/ApparatusService.java

@@ -1,11 +1,12 @@
 package com.iamberry.wechat.face.apparatus;
 
 import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+import com.iamberry.wechat.core.entity.member.Member;
 
 import java.util.List;
 
 /**
- * Created by Administrator on 2017/12/28.
+ * Created by liuzhiwei on 2017/12/28.
  */
 public interface ApparatusService {
 
@@ -15,4 +16,18 @@ public interface ApparatusService {
      * @return
      */
     List<Apparatus> listApparatusPage(Apparatus apparatus);
+
+    /**
+     * 添加机器信息
+     * @param apparatus
+     * @return
+     */
+    Integer addApparatus(Apparatus apparatus);
+
+    /**
+     * 注册会员
+     * @param apparatus
+     * @return
+     */
+    boolean registerMember(Apparatus apparatus, Member member);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/apparatus/ApparatusServiceImpl.java

@@ -1,6 +1,7 @@
 package com.iamberry.wechat.service.apparatus;
 
 import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.face.apparatus.ApparatusService;
 import com.iamberry.wechat.service.mapper.ApparatusMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,4 +22,16 @@ public class ApparatusServiceImpl implements ApparatusService {
     public List<Apparatus> listApparatusPage(Apparatus apparatus) {
         return apparatusMapper.listApparatusPage(apparatus);
     }
+
+    @Override
+    public Integer addApparatus(Apparatus apparatus) {
+        return apparatusMapper.addApparatus(apparatus);
+    }
+
+    @Override
+    public boolean registerMember(Apparatus apparatus, Member member) {
+        //添加机器信息
+        int num = apparatusMapper.addApparatus(apparatus);
+        return true;
+    }
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ApparatusMapper.java

@@ -15,4 +15,11 @@ public interface ApparatusMapper {
      * @return
      */
     List<Apparatus> listApparatusPage(Apparatus apparatus);
+
+    /**
+     * 添加机器信息
+     * @param apparatus
+     * @return
+     */
+    Integer addApparatus(Apparatus apparatus);
 }

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

@@ -18,10 +18,27 @@
         <if test="apparatusStatus != null and apparatusStatus != ''">
             AND apparatus_status = #{apparatusStatus}
         </if>
+        <if test="apparatusBarcode != null and apparatusBarcode != ''">
+            AND apparatus_barcode = #{apparatusBarcode}
+        </if>
       </where>
         ORDER BY apparatus_id DESC
       <if test="page!=null and page.pageSize>0 ">
           LIMIT ${page.recordBegin},${page.pageSize}
       </if>
     </select>
+
+    <!-- 添加机器信息 -->
+    <insert id="addApparatus" parameterType="Apparatus">
+        INSERT INTO tb_iamberry_member_apparatus
+        (
+          apparatus_barcode, user_openid, apparatus_status, apparatus_create_time,
+          store_id, apparatus_buy_date, apparatus_warranty_date
+        )
+        VALUES
+        (
+          #{apparatusBarcode}, #{userOpenid}, #{apparatusStatus}, NOW(),
+          #{storeId}, #{apparatusBuyDate}, #{apparatusWarrantyDate}
+        )
+    </insert>
 </mapper>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -3,17 +3,26 @@ package com.iamberry.wechat.handles.apparatus;
 import com.iamberry.wechat.core.entity.PageBean;
 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.apparatus.Apparatus;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.apparatus.ApparatusService;
+import com.iamberry.wechat.tools.HttpClient431Util;
+import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.tools.payUtil.StringUtil;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringEscapeUtils;
 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;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * Created by liuzhiwei on 2017/12/28.
@@ -24,6 +33,8 @@ public class ApparatusHandler {
 
     @Autowired
     private ApparatusService apparatusService;
+    @Autowired
+    private SystemService systemService;
 
     /**
      * 分页查询用户机器信息
@@ -33,6 +44,7 @@ public class ApparatusHandler {
      * @return
      * @throws Exception
      */
+    @ResponseBody
     @RequestMapping("/select_apparatus_page")
     public ResultMsg selectApparatusPage(HttpServletRequest request,
                                          @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
@@ -53,4 +65,65 @@ public class ApparatusHandler {
         msg.setStatus(true);
         return msg;
     }
+
+    /**
+     * 注册会员
+     * @param request
+     * @param member
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("add_apparatus")
+    public ResultMsg addApparatus(HttpServletRequest request,Member member) throws Exception {
+        ResultMsg msg = new ResultMsg();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Member memberInfo = WechatUtils.getUserBySession(request);
+        //获取换新时间期限
+        ShopSystemRule renewRule =  systemService.selectOneShopRuleById(246);
+        member.setUserOpenid(memberInfo.getUserOpenid());
+        //获取二维码中机器条形码
+        String barCode = request.getParameter("barCode");
+        String buyDate = request.getParameter("buyDate");
+        String storeId = request.getParameter("storeId");
+
+        if (!StringUtil.isNotEmpty(barCode)) {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            msg.setMessage("机器条形码为空，请重新扫描二维码!");
+            return msg;
+        }
+
+        Apparatus apparatus = new Apparatus();
+        apparatus.setApparatusStatus(1);
+        apparatus.setApparatusBarcode(barCode);
+        //获取机器信息
+        List<Apparatus> apparatusList = apparatusService.listApparatusPage(apparatus);
+        if (apparatusList != null && apparatusList.size() > 0) {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            msg.setMessage("机器条形码为空，请重新扫描二维码!");
+            return msg;
+        }
+        apparatus.setUserOpenid(memberInfo.getUserOpenid());
+        apparatus.setApparatusBuyDate(format.parse(buyDate));
+        apparatus.setApparatusWarrantyDate(updateDate(format.parse(buyDate),renewRule.getRuleNum().intValue()));
+        apparatus.setStoreId(Integer.getInteger(storeId));
+
+        return msg;
+    }
+
+    /**
+     * 修改日期 增加月
+     * @param date
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    public Date updateDate(Date date,int month) throws Exception {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH, month);
+        return calendar.getTime();
+    }
 }

tooth-wechat-web/src/main/resources/iamberry-app-service-config.properties

@@ -12,7 +12,7 @@ appkey=cef2f16aa36424f2a6d4ca60
 cdnUrl=http://cms.iamberry.com/cdn
 base_url=http://app.iamberry.com/imberry
 INTER_SMS_URL=https://sms.yunpian.com/v2/sms/single_send.json
-INTER_SMS_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u662F{0}\uFF0C3\u5206\u949F\u5185\u6709\u6548\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1
+INTER_SMS_TEXT=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u662F{0}\uFF0C3\u5206\u949F\u5185\u6709\u6548\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1
 INTER_SMS_RENT_TYPE1_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u611F\u8C22\u60A8\u79DF\u7528watero\u51C0\u6C34\u673A\uFF0C\u79DF\u671F{0}\u5E74\uFF01\u5DF2\u6536\u5230\u60A8\u7684\u62BC\u91D1{1}\u5143\uFF0C\u670D\u52A1\u8D39{2}\u5143\uFF08\u79DF\u671F\u5185\u5C06\u63D0\u4F9B\u6EE4\u82AF\u514D\u8D39\u66F4\u6362\u670D\u52A1\uFF09\u3002
 INTER_SMS_RENT_TYPE2_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u611F\u8C22\u60A8\u79DF\u7528watero\u51C0\u6C34\u673A\uFF0C\u79DF\u671F{0}\u5E74\uFF01\u5DF2\u4E3A\u60A8\u514D\u53BB{1}\u5143\u62BC\u91D1\uFF0C\u6536\u5230\u670D\u52A1\u8D39{2}\u5143\uFF08\u79DF\u671F\u5185\u5C06\u63D0\u4F9B\u6EE4\u82AF\u514D\u8D39\u66F4\u6362\u670D\u52A1\uFF09\u3002
 INTER_SMS_RENT_TYPE3_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u611F\u8C22\u60A8\u79DF\u7528watero\u51C0\u6C34\u673A\uFF01\u6536\u52303\u5E74\u670D\u52A1\u8D39{0}\u5143\u3002\u4F18\u60E0\uFF1A\u51C0\u6C34\u673A\u9001\u7ED9\u60A8\uFF0C\u5E76\u591A\u9001\u60A81\u5E74\u79DF\u671F\u3002\uFF08\u79DF\u671F\u51714\u5E74\uFF09
@@ -22,5 +22,5 @@ LEASE_ORDER_SUCCESS_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u60A8\u5728{0}\u79DF\u75
 PROBATION_SUCCESS_FIRST_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u535516\u5929\u540E\u5C06\u5230\u671F\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u4E0E\u4F18\u60E0\u4FE1\u606F\u3002
 PROBATION_SUCCESS_SECOND_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u53557\u5929\u540E\u5C06\u5230\u671F\uFF0C\u540C\u65F6\uFF0C\u8FD8\u67092\u76D2\u517B\u751F\u8336\u996E\u5F85\u9886\u53D6\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u3002
 PROBATION_SUCCESS_THIRD_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u53552\u5929\u540E\u5C06\u5230\u671F\uFF0C\u540C\u65F6\uFF0C\u8FD8\u67091L\u7CBE\u7F8E\u91CF\u676F\u5F85\u9886\u53D6\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u3002
-INFORM_SHIPPING=\u3010\u7F8E\u56FDWaterO\u3011\u4EB2\uFF0C\u60A8\u7684\u8BA2\u5355\u5DF2\u53D1\u8D27\u3002\u5173\u6CE8\u201C\u6C34\u65F6\u4EE3WaterO\u201D\u516C\u4F17\u53F7\u53EF\u67E5\u8BE2\u7269\u6D41\u4FE1\u606F
-ORDER_UPDATE_STATUS_TEXT=\u3010\u7F8E\u56FDWaterO\u3011\u6709\u4E00\u4E2A\u8BA2\u5355\u5F85{0}\uFF0C\u8BF7\u767B\u9646\u4E0A\u6D77WaterO\u5FAE\u4FE1\u540E\u53F0\u5904\u7406\u3002
+INFORM_SHIPPING=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u4EB2\uFF0C\u60A8\u7684\u8BA2\u5355\u5DF2\u53D1\u8D27\u3002\u5173\u6CE8\u201C\u4E0A\u6735\u5FAE\u5546\u57CE\u201D\u516C\u4F17\u53F7\u53EF\u67E5\u8BE2\u7269\u6D41\u4FE1\u606F
+ORDER_UPDATE_STATUS_TEXT=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u6709\u4E00\u4E2A\u8BA2\u5355\u5F85{0}\uFF0C\u8BF7\u767B\u9646\u4E0A\u6735\u5FAE\u4FE1\u540E\u53F0\u5904\u7406\u3002

tooth-wechat-web/src/main/webapp/common/js/admin/public/wxtree.js

@@ -473,11 +473,11 @@
 					alert('不能包含双引号');
 					return false;
 				}
-				if (cont.indexOf("\"") > -1 || cont.indexOf("\“") > -1
+				/*if (cont.indexOf("\"") > -1 || cont.indexOf("\“") > -1
 						|| cont.indexOf("\”") > -1) {
 					alert('不能包含双引号');
 					return false;
-				}
+				}*/
 
 				var treeObj = $.fn.zTree.getZTreeObj("treeDemo");
 				var nd = treeObj.getNodeByParam("id", tid, null);//根据节点id查找