添加了进入更换刷头的赠送优惠券id

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminAgentToothHandler.java

@@ -617,6 +617,21 @@ public class AdminAgentToothHandler {
             msg.setStatus(false);
             msg.setMessage("修改代理商配置失败!");
         }
+        AgentTooth agent = new AgentTooth();
+        agent.setAgentTel(agentTooth.getAgentTel());
+        agent.setAgentStatus(1);
+        //根据条件查询代理商
+        List<AgentTooth> agentList = agentInfoService.selectAllAgentinfo(agent);
+        if (agentList != null && agentList.size() > 0) {
+            //只可能存在一条数据
+            agent = agentList.get(0);
+            if (agentTooth.getAgentId().intValue() != agent.getAgentId()) {
+                msg.setResultCode(ResultInfo.ERRORCODE);
+                msg.setStatus(false);
+                msg.setMessage("该电话号码已被注册，不能重复注册!");
+                return msg;
+            }
+        }
         //修改代理商信息
         int num = agentInfoService.updateAgentTooth(agentTooth);
         if (num > 0) {
@@ -683,6 +698,19 @@ public class AdminAgentToothHandler {
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
             msg.setMessage("修改代理商配置失败!");
+            return msg;
+        }
+
+        AgentTooth agent = new AgentTooth();
+        agent.setAgentTel(agentTooth.getAgentTel());
+        agent.setAgentStatus(1);
+        //根据条件查询代理商
+        List<AgentTooth> agentList = agentInfoService.selectAllAgentinfo(agent);
+        if (agentList != null && agentList.size() > 0) {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            msg.setMessage("该电话号码已被注册，不能重复注册!");
+            return msg;
         }
         //add代理商信息
         int num = agentInfoService.addAgentinfo(agentTooth);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/agentInfo/AgentToothHandler.java

@@ -2,9 +2,11 @@ package com.iamberry.wechat.handles.agentInfo;
 
 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.agentInfo.AgentTooth;
 import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.agentInfo.AgentInfoService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.face.member.MemberService;
@@ -18,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 代理商逻辑处理类
@@ -36,6 +40,8 @@ public class AgentToothHandler {
     private MemberService memberService;
     @Autowired
     private AgentPurchaseOrderService agentPurchaseOrderService;
+    @Autowired
+    private SystemService systemService;
 
     /**
      * 查询代理商信息
@@ -113,7 +119,7 @@ public class AgentToothHandler {
             msg.setStatus(true);
             return msg;
         } else {
-            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setResultCode(ResultInfo.ERRORCODE) ;
             msg.setMessage("激活失败,请重新激活!");
             msg.setStatus(false);
             return msg;
@@ -130,6 +136,7 @@ public class AgentToothHandler {
     @RequestMapping("/select_order_hint")
     public ResultMsg selectOrderHint(HttpServletRequest request) throws Exception {
         ResultMsg msg = new ResultMsg();
+        Map<String,Object> map = new HashMap<String,Object>();
         String hintId = request.getParameter("hintId");
         if (!StringUtils.isNotEmpty(hintId)) {
             msg.setResultCode(ResultInfo.ERRORCODE);
@@ -145,7 +152,12 @@ public class AgentToothHandler {
             msg.setStatus(false);
             return msg;
         }
+
+        //获取需要赠送的优惠券id
+        ShopSystemRule rule = systemService.selectOneShopRuleById(105);
         hint = hintList.get(0);
+        map.put("hint",hint);
+        map.put("couponTypeId",rule.getRuleNum());
         msg.setData(hint);
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setStatus(true);