代码更新

src/main/java/com/agent/action/audit/AuditDetailController.java

@@ -1309,6 +1309,16 @@ public class AuditDetailController extends AbstractController{
 			displaceAuditBean.setAuditStatus("4");
 
 
+			//精品机判断是否是通票卖家
+			log.info("jpjgh===="+jpjgh);
+			log.info("saleId===="+displaceAuditBean.getSaleId());
+			if(jpjgh.equals(displaceAuditBean.getAgentId())){
+				String paltTpSet=displaceAuditService.findSaleInfoBySaleId(displaceAuditBean.getSaleId());
+				log.info("1paltTpSet===="+paltTpSet);
+				if(StringUtils.isNotBlank(paltTpSet)&&"0".equals(paltTpSet)){
+					displaceAuditBean.setIfDeposit("1");
+				}
+			}
 			// 补充信息
     	    boolean flag = displaceAuditService.addInfoNew(displaceAuditBean);
     	    if(!flag) {
@@ -1326,7 +1336,7 @@ public class AuditDetailController extends AbstractController{
             wxsms = wxsms.replaceAll("first", "有一台设备正在寻找买家");
             wxsms = wxsms.replaceAll("keyword1", sbmc+"");
 			if("3".equals(displaceAuditBean.getUpType())){
-				wxsms = wxsms.replaceAll("keyword2", "最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice());
+				wxsms = wxsms.replaceAll("keyword2", "最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice()+"万元");
 			}else{
 				wxsms = wxsms.replaceAll("keyword2", displaceAuditBean.getMinMoney()+"万元");
 			}
@@ -1358,7 +1368,7 @@ public class AuditDetailController extends AbstractController{
 	                param1.put("first",new TemplateData("有一台设备正在寻找买家","#696969"));
 	                param1.put("keyword1",new TemplateData(sbmc+"","#696969"));
 					if("3".equals(displaceAuditBean.getUpType())){
-						param1.put("keyword2",new TemplateData("最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice(),"#696969"));
+						param1.put("keyword2",new TemplateData("最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice()+"万元","#696969"));
 					}else{
 						param1.put("keyword2",new TemplateData(displaceAuditBean.getMinMoney()+"万元","#696969"));
 					}
@@ -1414,7 +1424,7 @@ public class AuditDetailController extends AbstractController{
                         param2.put("first",new TemplateData("有一台设备正在寻找买家","#696969"));
                         param2.put("keyword1",new TemplateData(sbmc+"","#696969"));
 						if("3".equals(displaceAuditBean.getUpType())){
-							param2.put("keyword2",new TemplateData("最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice(),"#696969"));
+							param2.put("keyword2",new TemplateData("最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice()+"万元","#696969"));
 						}else{
 							param2.put("keyword2",new TemplateData(displaceAuditBean.getMinMoney()+"万元","#696969"));
 						}
@@ -1694,13 +1704,24 @@ public class AuditDetailController extends AbstractController{
 			displaceAuditBean.setAuditStatus("4");
 
 
+			//精品机判断是否是通票卖家
+			log.info("1jpjgh===="+jpjgh);
+			log.info("saleId===="+displaceAuditBean.getSaleId());
+			String saleId_f=StringUtils.isBlank(displaceAuditBean.getSaleId())?"":displaceAuditBean.getSaleId();
+			if(StringUtils.isBlank(displaceAuditBean.getSaleId())){
+				saleId_f=displaceAuditService.findDisPlaceInfoById(displaceAuditBean.getDisplaceId());
+			}
+			if(jpjgh.equals(displaceAuditBean.getAgentId())&&!("2").equals(displaceAuditBean.getIfDeposit())){
+				String paltTpSet=displaceAuditService.findSaleInfoBySaleId(saleId_f);
+				log.info("1paltTpSet===="+paltTpSet);
+				if(StringUtils.isNotBlank(paltTpSet)&&"0".equals(paltTpSet)){
+					displaceAuditBean.setIfDeposit("1");
+				}else{
+					displaceAuditBean.setIfDeposit("2");
+				}
+			}
+
 
-        	// 补充信息
-    	    boolean flag = displaceAuditService.addInfoNew(displaceAuditBean);
-    	    if(!flag){
-                resultBean= new PageResultBean(PageResultBean.FAIL_CODE,"系统繁忙，请稍后再来！");
-                return;
-            }
 
         	// 记录id
             String id = super.getParameter(request, "id");
@@ -1728,109 +1749,164 @@ public class AuditDetailController extends AbstractController{
 				pubTimeStr = "";
 			}
 
-            // 反馈内容
-          //  String diggerUrl = TemplateConstants.ZHSH_DIGGER_URL + "?agentId=" + agentId + "&id=" + id;
-			String diggerUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId="+displaceId+"&status="+displaceAuditBean.getAuditStatus()+"&id=" + id;
-            String sms = TemplateConstants.ZHSH_DIGGER_UP_SMS;
-            sms = sms.replaceAll("agentName", agentName);
-            sms = sms.replaceAll("displaceId", displaceId);
-            sms = sms.replaceAll("sbmc", sbmc);
-
-            String wxsms = TemplateConstants.ZHSH_DIGGER_TEMPLATE_CONTENT;
-            wxsms = wxsms.replaceAll("first", "有一台设备正在寻找买家");
-            wxsms = wxsms.replaceAll("keyword1", sbmc+"");
-			if("3".equals(displaceAuditBean.getUpType())){
-				wxsms = wxsms.replaceAll("keyword2", "最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice());
-			}else{
-				wxsms = wxsms.replaceAll("keyword2", displaceAuditBean.getMinMoney()+"万元");
-			}
-            wxsms = wxsms.replaceAll("keyword3", displaceAuditBean.getMoneyRange()+"万元");
-            wxsms = wxsms.replaceAll("keyword4", DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"));
-            wxsms = wxsms.replaceAll("keyword5", displaceAuditBean.getBail()+"万元");
-            wxsms = wxsms.replaceAll("remark", "点击【详情】前往查看！");
-
-            List<PushRecordBean> list = new ArrayList<PushRecordBean>();
-            PushRecordBean pushRecord = null;
-
-            // 发送车商信息
-            String[] diggers = ids.substring(0, ids.lastIndexOf(",")).split(",");
-            for (int i = 0; i < diggers.length; i++) {
-            	//获取车商bean，并获取车商微信openid和其他信息
-                DiggerBean digger = diggerBeanService.queryDiggerByID(diggers[i]);
-                if(digger == null){
-                	continue;
-                }
-                String openId = digger.getWxOpenID();
-                String wxnc = digger.getDaWxnc();
-                String wxh = digger.getDaWxh();
-                String name = digger.getDaName();
-                String phone = digger.getDaPhone();
-
-                // 组装车商微信内容
-                Map<String,TemplateData> param1 = new HashMap<String,TemplateData>();
-                param1.put("first",new TemplateData("有一台设备正在寻找买家","#696969"));
-                param1.put("keyword1",new TemplateData(sbmc+"","#696969"));
-				if("3".equals(displaceAuditBean.getUpType())){
-					param1.put("keyword2",new TemplateData("最低价："+displaceAuditBean.getMinPrice()+"万元-最高价："+displaceAuditBean.getMaxPrice(),"#696969"));
-				}else{
-					param1.put("keyword2",new TemplateData(displaceAuditBean.getMinMoney()+"万元","#696969"));
-				}
-                param1.put("keyword3",new TemplateData(displaceAuditBean.getMoneyRange()+"万元","#696969"));
-                param1.put("keyword4",new TemplateData(DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"),"#696969"));
-                param1.put("keyword5",new TemplateData(displaceAuditBean.getBail()+"万元","#696969"));
-                param1.put("remark",new TemplateData("点击【详情】前往查看！","#696969"));
-
-    	        wxsms = wxsms.replaceAll("keyword1", wxnc);
-               /* pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
-            			appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
-                list.add(pushRecord);*/
-                pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1",ConfigConstants.XXLB_SBSJ,
-            			appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
-                list.add(pushRecord);
+			//存储被推送人 ids
+			displaceAuditBean.setIds(ids);
+			// 补充信息
+			boolean flag = displaceAuditService.addInfoNew(displaceAuditBean);
+			if(!flag){
+				resultBean= new PageResultBean(PageResultBean.FAIL_CODE,"系统繁忙，请稍后再来！");
+				return;
 			}
 
-            // 发送销售员信息
-            if(StringUtils.isNotBlank(saleId)) {
-            	SalesBean salesBean = saleBeanService.getSaleBeanBySaleId(saleId);
-            	if(salesBean != null){
-            		String openId = salesBean.getWxOpenid();
-                    String wxnc = salesBean.getSaleWxnc();
-                    String wxh = salesBean.getSaleWxh();
-                    String name = salesBean.getSaleName();
-                    String phone = salesBean.getSalePhone();
-					String xqurl="https://www.xxinjiyuan.com/wjj-api/index.html#/join?agentId=GZZSNJ&displaceId=GZZSNJ-ZH0044&status=finished&id=5c8adc199c7f44a8ac398d9edbcd4914";
-                   // String saleUrl = TemplateConstants.ZHSH_SALE_URL + "?agentId=" + agentId + "&id=" + id;
-					String saleUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId="+displaceId+"&status="+displaceAuditBean+"&id=" + id;
-                    // 组装销售员微信内容
-                    Map<String,TemplateData> param2 = new HashMap<String,TemplateData>();
-                    param2.put("first",new TemplateData("您上传的设备已上架成功，等待买家出价","#696969"));
-                    param2.put("keyword1",new TemplateData(wxnc,"#696969"));
-                    param2.put("keyword2",new TemplateData(sbmc,"#696969"));
-                    param2.put("keyword3",new TemplateData(pubTimeStr,"#696969"));
-                    param2.put("keyword4",new TemplateData("上架成功","#696969"));
-
-                    String upsms = TemplateConstants.ZHSH_SALE_UP_SMS;
-                    upsms = upsms.replace("sbmc", sbmc);
-
-                    String wxsms1 = TemplateConstants.ZHSH_SALE_TEMPLATE_CONTENT;
-                    wxsms1 = wxsms1.replaceAll("first", "您上传的设备已上架成功，等待买家出价");
-                    wxsms1 = wxsms1.replaceAll("keyword1", wxnc);
-                    wxsms1 = wxsms1.replaceAll("keyword2", sbmc);
-                    wxsms1 = wxsms1.replaceAll("keyword3", pubTimeStr);
-                    wxsms1 = wxsms1.replaceAll("keyword4", "上架成功");
-                    wxsms1 = wxsms1.replaceAll("remark", "赶快点击“详情”分享给大家吧！");
+			PushRecordBean pushRecord = null;
+			List<PushRecordBean> list = new ArrayList<PushRecordBean>();
+			//如果卖家不是通票会员，推送给卖家支付固定保证金
+			if("1".equals(displaceAuditBean.getIfDeposit())){
+				// 发送销售员信息
+				if(StringUtils.isNotBlank(saleId)) {
+					SalesBean salesBean = saleBeanService.getSaleBeanBySaleId(saleId);
+					if(salesBean != null){
+						String openId = salesBean.getWxOpenid();
+						String wxnc = salesBean.getSaleWxnc();
+						String wxh = salesBean.getSaleWxh();
+						String name = salesBean.getSaleName();
+						String phone = salesBean.getSalePhone();
+						String xqurl="https://www.xxinjiyuan.com/wjj-api/index.html#/join?agentId=GZZSNJ&displaceId=GZZSNJ-ZH0044&status=finished&id=5c8adc199c7f44a8ac398d9edbcd4914";
+						// String saleUrl = TemplateConstants.ZHSH_SALE_URL + "?agentId=" + agentId + "&id=" + id;
+						String saleUrl = "https://www.weigongcheng.net/wjj-api/index.html#/payment?" + "?agentId=" + agentId +"&id=" + id;
+						// 组装销售员微信内容
+						Map<String,TemplateData> param2 = new HashMap<String,TemplateData>();
+						param2.put("first",new TemplateData("您上传的设备已审核通过，请及时确认上架","#696969"));
+						param2.put("keyword1",new TemplateData(wxnc,"#696969"));
+						param2.put("keyword2",new TemplateData(sbmc,"#696969"));
+						param2.put("keyword3",new TemplateData(pubTimeStr,"#696969"));
+						param2.put("keyword4",new TemplateData("待上架","#696969"));
+
+						String upsms = TemplateConstants.ZHSH_SALE_UP_SMS;
+						upsms = upsms.replace("sbmc", sbmc);
+
+						String wxsms1 = TemplateConstants.ZHSH_SALE_TEMPLATE_CONTENT;
+						wxsms1 = wxsms1.replaceAll("first", "您上传的设备已上架成功，等待买家出价");
+						wxsms1 = wxsms1.replaceAll("keyword1", wxnc);
+						wxsms1 = wxsms1.replaceAll("keyword2", sbmc);
+						wxsms1 = wxsms1.replaceAll("keyword3", pubTimeStr);
+						wxsms1 = wxsms1.replaceAll("keyword4", "上架成功");
+						wxsms1 = wxsms1.replaceAll("remark", "点击详情立即确认");
 
                     /*pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
                 			appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
                     list.add(pushRecord);*/
-                    pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1",ConfigConstants.XXLB_SBSJ,
-                			appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
-                    list.add(pushRecord);
-            	}
-            }
+						pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1",ConfigConstants.XXLB_SBSJ,
+								appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
+						list.add(pushRecord);
+					}
+				}
 
-            // 保存推送消息
-            pushRecordBeanService.saveRecords(list);
+				// 保存推送消息
+				pushRecordBeanService.saveRecords(list);
+			}else {
+
+				// 反馈内容
+				//  String diggerUrl = TemplateConstants.ZHSH_DIGGER_URL + "?agentId=" + agentId + "&id=" + id;
+				String diggerUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId=" + displaceId + "&status=" + displaceAuditBean.getAuditStatus() + "&id=" + id;
+				String sms = TemplateConstants.ZHSH_DIGGER_UP_SMS;
+				sms = sms.replaceAll("agentName", agentName);
+				sms = sms.replaceAll("displaceId", displaceId);
+				sms = sms.replaceAll("sbmc", sbmc);
+
+				String wxsms = TemplateConstants.ZHSH_DIGGER_TEMPLATE_CONTENT;
+				wxsms = wxsms.replaceAll("first", "有一台设备正在寻找买家");
+				wxsms = wxsms.replaceAll("keyword1", sbmc + "");
+				if ("3".equals(displaceAuditBean.getUpType())) {
+					wxsms = wxsms.replaceAll("keyword2", "最低价：" + displaceAuditBean.getMinPrice() + "万元-最高价：" + displaceAuditBean.getMaxPrice() + "万元");
+				} else {
+					wxsms = wxsms.replaceAll("keyword2", displaceAuditBean.getMinMoney() + "万元");
+				}
+				wxsms = wxsms.replaceAll("keyword3", displaceAuditBean.getMoneyRange() + "万元");
+				wxsms = wxsms.replaceAll("keyword4", DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"));
+				wxsms = wxsms.replaceAll("keyword5", displaceAuditBean.getBail() + "万元");
+				wxsms = wxsms.replaceAll("remark", "点击【详情】前往查看！");
+
+				// 发送车商信息
+				String[] diggers = ids.substring(0, ids.lastIndexOf(",")).split(",");
+				for (int i = 0; i < diggers.length; i++) {
+					//获取车商bean，并获取车商微信openid和其他信息
+					DiggerBean digger = diggerBeanService.queryDiggerByID(diggers[i]);
+					if (digger == null) {
+						continue;
+					}
+					String openId = digger.getWxOpenID();
+					String wxnc = digger.getDaWxnc();
+					String wxh = digger.getDaWxh();
+					String name = digger.getDaName();
+					String phone = digger.getDaPhone();
+
+					// 组装车商微信内容
+					Map<String, TemplateData> param1 = new HashMap<String, TemplateData>();
+					param1.put("first", new TemplateData("有一台设备正在寻找买家", "#696969"));
+					param1.put("keyword1", new TemplateData(sbmc + "", "#696969"));
+					if ("3".equals(displaceAuditBean.getUpType())) {
+						param1.put("keyword2", new TemplateData("最低价：" + displaceAuditBean.getMinPrice() + "万元-最高价：" + displaceAuditBean.getMaxPrice() + "万元", "#696969"));
+					} else {
+						param1.put("keyword2", new TemplateData(displaceAuditBean.getMinMoney() + "万元", "#696969"));
+					}
+					param1.put("keyword3", new TemplateData(displaceAuditBean.getMoneyRange() + "万元", "#696969"));
+					param1.put("keyword4", new TemplateData(DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"), "#696969"));
+					param1.put("keyword5", new TemplateData(displaceAuditBean.getBail() + "万元", "#696969"));
+					param1.put("remark", new TemplateData("点击【详情】前往查看！", "#696969"));
+
+					wxsms = wxsms.replaceAll("keyword1", wxnc);
+				   /* pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
+							appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
+					list.add(pushRecord);*/
+					pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1", ConfigConstants.XXLB_SBSJ,
+							appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
+					list.add(pushRecord);
+				}
+
+				// 发送销售员信息
+				if (StringUtils.isNotBlank(saleId)) {
+					SalesBean salesBean = saleBeanService.getSaleBeanBySaleId(saleId);
+					if (salesBean != null) {
+						String openId = salesBean.getWxOpenid();
+						String wxnc = salesBean.getSaleWxnc();
+						String wxh = salesBean.getSaleWxh();
+						String name = salesBean.getSaleName();
+						String phone = salesBean.getSalePhone();
+						String xqurl = "https://www.xxinjiyuan.com/wjj-api/index.html#/join?agentId=GZZSNJ&displaceId=GZZSNJ-ZH0044&status=finished&id=5c8adc199c7f44a8ac398d9edbcd4914";
+						// String saleUrl = TemplateConstants.ZHSH_SALE_URL + "?agentId=" + agentId + "&id=" + id;
+						String saleUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId=" + displaceId + "&status=" + displaceAuditBean + "&id=" + id;
+						// 组装销售员微信内容
+						Map<String, TemplateData> param2 = new HashMap<String, TemplateData>();
+						param2.put("first", new TemplateData("您上传的设备已上架成功，等待买家出价", "#696969"));
+						param2.put("keyword1", new TemplateData(wxnc, "#696969"));
+						param2.put("keyword2", new TemplateData(sbmc, "#696969"));
+						param2.put("keyword3", new TemplateData(pubTimeStr, "#696969"));
+						param2.put("keyword4", new TemplateData("上架成功", "#696969"));
+
+						String upsms = TemplateConstants.ZHSH_SALE_UP_SMS;
+						upsms = upsms.replace("sbmc", sbmc);
+
+						String wxsms1 = TemplateConstants.ZHSH_SALE_TEMPLATE_CONTENT;
+						wxsms1 = wxsms1.replaceAll("first", "您上传的设备已上架成功，等待买家出价");
+						wxsms1 = wxsms1.replaceAll("keyword1", wxnc);
+						wxsms1 = wxsms1.replaceAll("keyword2", sbmc);
+						wxsms1 = wxsms1.replaceAll("keyword3", pubTimeStr);
+						wxsms1 = wxsms1.replaceAll("keyword4", "上架成功");
+						wxsms1 = wxsms1.replaceAll("remark", "赶快点击“详情”分享给大家吧！");
+
+						/*pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
+								appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
+						list.add(pushRecord);*/
+						pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1", ConfigConstants.XXLB_SBSJ,
+								appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
+						list.add(pushRecord);
+					}
+				}
+
+				// 保存推送消息
+				pushRecordBeanService.saveRecords(list);
+			}
         } catch (Exception e) {
             resultBean= new PageResultBean(PageResultBean.FAIL_CODE,"系统繁忙，请稍后再来！");
             log.error("addInfo error!",e);
@@ -1840,7 +1916,210 @@ public class AuditDetailController extends AbstractController{
 
     }
 
-    /**
+
+
+
+
+	@RequestMapping("/appAddInfo2.do")
+	public void appAddInfo2(HttpServletRequest request, HttpServletResponse response,  @ModelAttribute DisplaceAuditBean displaceAuditBean){
+		//返回页面数据
+		PageResultBean resultBean =  new PageResultBean(PageResultBean.SUCCESS_CODE,"成功！");;
+
+		try {
+
+
+			Double min=Double.parseDouble(displaceAuditBean.getMinPrice());
+			Double max=Double.parseDouble(displaceAuditBean.getMaxPrice());
+			Double moneyRang=Double.parseDouble(displaceAuditBean.getMoneyRange());
+
+			String displaceId = super.getParameter(request, "displaceId");
+			//获取置换信息
+			displaceAuditBean=displaceAuditService.queryAuditAllByDisplaceId(displaceId);
+
+
+
+			//修改状态为 已审核待上架
+
+/*
+        	  修改设备状态为 已审核已上架
+        	 */
+/*			if (null != displaceAuditBean.getAgentType() && displaceAuditBean.getAgentType() == 2) {
+				log.info("商家类型为代运营，更新为已审核待上架");
+				displaceAuditBean.setAuditStatus("4");
+			}
+			log.info("商家类型为自运营，更新为已审核待上架",displaceAuditBean.getAgentType());
+			if (displaceAuditBean.getAgentType() == 1) {
+				log.info("商家类型为自运营，更新为已审核待上架");
+				displaceAuditBean.setAuditStatus("4");
+			}*/
+
+			log.info("更新为已审核待上架");
+			displaceAuditBean.setAuditStatus("4");
+
+
+			//精品机判断是否是通票卖家
+			log.info("1jpjgh===="+jpjgh);
+			log.info("saleId===="+displaceAuditBean.getSaleId());
+
+			// 记录id
+			String id = super.getParameter(request, "id");
+			// 车商ID
+			String ids = super.getParameter(request, "ids");
+			if(StringUtils.isEmpty(ids)) {
+				resultBean = new PageResultBean(PageResultBean.FAIL_CODE, "请选择推送车商！");
+				return;
+			}
+
+			// 销售员ID
+			String saleId = super.getParameter(request, "saleId");
+			//取出带过来的置换ID
+			DisplaceAuditBean displace = displaceAuditService.queryAuditPageByDisplaceId(displaceId);
+			//设备名称
+			String sbmc = displace.getAttrContent().get("sbpp") + " " + displace.getAttrContent().get("sbxh") + " " + displace.getAttrContent().get("sblx");
+			// 发布时间
+			String pubTimeStr = super.getParameter(request, "pubTimeStr");
+			Date pubTime = null;
+			try {
+				pubTime = DateUtil.parse(pubTimeStr, DateUtil.DEFAULT);
+				pubTimeStr = DateUtil.format(pubTime, "yyyy年MM月dd日 HH:mm");
+			} catch (Exception e) {
+				pubTimeStr = "";
+			}
+
+			//存储被推送人 ids
+			displaceAuditBean.setIds(ids);
+			// 补充信息
+			boolean flag = displaceAuditService.addInfoNew(displaceAuditBean);
+			if(!flag){
+				resultBean= new PageResultBean(PageResultBean.FAIL_CODE,"系统繁忙，请稍后再来！");
+				return;
+			}
+
+			PushRecordBean pushRecord = null;
+			List<PushRecordBean> list = new ArrayList<PushRecordBean>();
+			String agentId=displaceAuditBean.getAgentId();
+			AgentBean agentBean = agentBeanService.getAgentBeanByAgentId(agentId);
+			if(agentBean == null) {
+				resultBean = new PageResultBean(PageResultBean.FAIL_CODE, "未查询到代理商信息！");
+				return;
+			}
+			String agentName = agentBean.getAgentName();
+			String appId =agentBean.getPubAppId();
+			String appSecret = agentBean.getPubAppSecret();
+			Date startTime = displaceAuditBean.getStartTime();
+			Date endTime = displaceAuditBean.getEndTime();
+
+			// 反馈内容
+			//  String diggerUrl = TemplateConstants.ZHSH_DIGGER_URL + "?agentId=" + agentId + "&id=" + id;
+			String diggerUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId=" + displaceId + "&status=" + displaceAuditBean.getAuditStatus() + "&id=" + id;
+			String sms = TemplateConstants.ZHSH_DIGGER_UP_SMS;
+			sms = sms.replaceAll("agentName", agentName);
+			sms = sms.replaceAll("displaceId", displaceId);
+			sms = sms.replaceAll("sbmc", sbmc);
+
+			String wxsms = TemplateConstants.ZHSH_DIGGER_TEMPLATE_CONTENT;
+			wxsms = wxsms.replaceAll("first", "有一台设备正在寻找买家");
+			wxsms = wxsms.replaceAll("keyword1", sbmc + "");
+			if ("3".equals(displaceAuditBean.getUpType())) {
+				wxsms = wxsms.replaceAll("keyword2", "最低价：" + displaceAuditBean.getMinPrice() + "万元-最高价：" + displaceAuditBean.getMaxPrice() + "万元");
+			} else {
+				wxsms = wxsms.replaceAll("keyword2", displaceAuditBean.getMinMoney() + "万元");
+			}
+			wxsms = wxsms.replaceAll("keyword3", displaceAuditBean.getMoneyRange() + "万元");
+			wxsms = wxsms.replaceAll("keyword4", DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"));
+			wxsms = wxsms.replaceAll("keyword5", displaceAuditBean.getBail() + "万元");
+			wxsms = wxsms.replaceAll("remark", "点击【详情】前往查看！");
+
+			// 发送车商信息
+			String[] diggers = ids.substring(0, ids.lastIndexOf(",")).split(",");
+			for (int i = 0; i < diggers.length; i++) {
+				//获取车商bean，并获取车商微信openid和其他信息
+				DiggerBean digger = diggerBeanService.queryDiggerByID(diggers[i]);
+				if (digger == null) {
+					continue;
+				}
+				String openId = digger.getWxOpenID();
+				String wxnc = digger.getDaWxnc();
+				String wxh = digger.getDaWxh();
+				String name = digger.getDaName();
+				String phone = digger.getDaPhone();
+
+				// 组装车商微信内容
+				Map<String, TemplateData> param1 = new HashMap<String, TemplateData>();
+				param1.put("first", new TemplateData("有一台设备正在寻找买家", "#696969"));
+				param1.put("keyword1", new TemplateData(sbmc + "", "#696969"));
+				if ("3".equals(displaceAuditBean.getUpType())) {
+					param1.put("keyword2", new TemplateData("最低价：" + displaceAuditBean.getMinPrice() + "万元-最高价：" + displaceAuditBean.getMaxPrice() + "万元", "#696969"));
+				} else {
+					param1.put("keyword2", new TemplateData(displaceAuditBean.getMinMoney() + "万元", "#696969"));
+				}
+				param1.put("keyword3", new TemplateData(displaceAuditBean.getMoneyRange() + "万元", "#696969"));
+				param1.put("keyword4", new TemplateData(DateUtil.format(startTime, "yyyy年MM月dd日 HH:mm"), "#696969"));
+				param1.put("keyword5", new TemplateData(displaceAuditBean.getBail() + "万元", "#696969"));
+				param1.put("remark", new TemplateData("点击【详情】前往查看！", "#696969"));
+
+				wxsms = wxsms.replaceAll("keyword1", wxnc);
+			   /* pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
+						appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
+				list.add(pushRecord);*/
+				pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1", ConfigConstants.XXLB_SBSJ,
+						appId, appSecret, sms, wxsms, param1, diggerUrl, "拍品上架通知");
+				list.add(pushRecord);
+			}
+
+			// 发送销售员信息
+			if (StringUtils.isNotBlank(saleId)) {
+				SalesBean salesBean = saleBeanService.getSaleBeanBySaleId(saleId);
+				if (salesBean != null) {
+					String openId = salesBean.getWxOpenid();
+					String wxnc = salesBean.getSaleWxnc();
+					String wxh = salesBean.getSaleWxh();
+					String name = salesBean.getSaleName();
+					String phone = salesBean.getSalePhone();
+					String xqurl = "https://www.xxinjiyuan.com/wjj-api/index.html#/join?agentId=GZZSNJ&displaceId=GZZSNJ-ZH0044&status=finished&id=5c8adc199c7f44a8ac398d9edbcd4914";
+					// String saleUrl = TemplateConstants.ZHSH_SALE_URL + "?agentId=" + agentId + "&id=" + id;
+					String saleUrl = "https://www.weigongcheng.net/wjj-api/index.html#/join" + "?agentId=" + agentId + "&displaceId=" + displaceId + "&status=" + displaceAuditBean + "&id=" + id;
+					// 组装销售员微信内容
+					Map<String, TemplateData> param2 = new HashMap<String, TemplateData>();
+					param2.put("first", new TemplateData("您上传的设备已上架成功，等待买家出价", "#696969"));
+					param2.put("keyword1", new TemplateData(wxnc, "#696969"));
+					param2.put("keyword2", new TemplateData(sbmc, "#696969"));
+					param2.put("keyword3", new TemplateData(pubTimeStr, "#696969"));
+					param2.put("keyword4", new TemplateData("上架成功", "#696969"));
+
+					String upsms = TemplateConstants.ZHSH_SALE_UP_SMS;
+					upsms = upsms.replace("sbmc", sbmc);
+
+					String wxsms1 = TemplateConstants.ZHSH_SALE_TEMPLATE_CONTENT;
+					wxsms1 = wxsms1.replaceAll("first", "您上传的设备已上架成功，等待买家出价");
+					wxsms1 = wxsms1.replaceAll("keyword1", wxnc);
+					wxsms1 = wxsms1.replaceAll("keyword2", sbmc);
+					wxsms1 = wxsms1.replaceAll("keyword3", pubTimeStr);
+					wxsms1 = wxsms1.replaceAll("keyword4", "上架成功");
+					wxsms1 = wxsms1.replaceAll("remark", "赶快点击“详情”分享给大家吧！");
+
+					/*pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "2",ConfigConstants.XXLB_SBSJ,
+							appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
+					list.add(pushRecord);*/
+					pushRecord = displaceAuditService.pushSms(displaceId, id, sbmc, ConfigConstants.CDMC_ZHSH, agentId, agentName, openId, wxnc, wxh, name, phone, "1", ConfigConstants.XXLB_SBSJ,
+							appId, appSecret, upsms, wxsms1, param2, saleUrl, "审核结果通知");
+					list.add(pushRecord);
+				}
+			}
+
+			// 保存推送消息
+			pushRecordBeanService.saveRecords(list);
+		} catch (Exception e) {
+			resultBean= new PageResultBean(PageResultBean.FAIL_CODE,"系统繁忙，请稍后再来！");
+			log.error("addInfo error!",e);
+		}finally{
+			super.printResult(request, response, resultBean.toString());
+		}
+
+	}
+
+
+	/**
      * 更新质保说明
      * @param request
      * @param response
@@ -2370,4 +2649,24 @@ public class AuditDetailController extends AbstractController{
 
     }
 
+
+
+	@RequestMapping("/checkUser.do")
+	public void  checkUser(HttpServletRequest request, HttpServletResponse response){
+		final String apiUrl = apiDomain + "certification/getUserInfoBySaleIdPost";
+		String agentId = super.getParameter(request, "agentId");
+		String saleId = super.getParameter(request, "saleId");
+		Map<String, Object> requestParameter = new HashMap<>();
+			requestParameter.put("agentId", agentId);
+			requestParameter.put("saleId", saleId);
+
+
+		final HttpResult httpResult = HttpUtils.post(apiUrl, requestParameter);
+			if (httpResult.getStatusCode() != 200) {
+			log.info("请求wjj微信模板失败.statusCode:{}", httpResult.getStatusCode());
+		}
+
+		final String content = httpResult.getContent();
+		super.printResult(request, response, content);
+	}
 }

src/main/java/com/agent/model/audit/bean/DisplaceAuditBean.java

@@ -175,6 +175,36 @@ public class DisplaceAuditBean implements Serializable{
 
 	private String agentRule;//1-置换报价  2-网络竞销 3-一口价秒杀
 
+	private String paltTpSet;//商家通票设置（1-开，0-关）
+
+	private String ifDeposit;//卖家是否已交保证金（1-未支付2已支付）
+
+	private String ids;//被推送人ids 逗号分隔
+
+	public String getIds() {
+		return ids;
+	}
+
+	public void setIds(String ids) {
+		this.ids = ids;
+	}
+
+	public String getIfDeposit() {
+		return ifDeposit;
+	}
+
+	public void setIfDeposit(String ifDeposit) {
+		this.ifDeposit = ifDeposit;
+	}
+
+	public String getPaltTpSet() {
+		return paltTpSet;
+	}
+
+	public void setPaltTpSet(String paltTpSet) {
+		this.paltTpSet = paltTpSet;
+	}
+
 	public String getAgentRule() {
 		return agentRule;
 	}

src/main/java/com/agent/model/audit/bpo/DisplaceAuditBpo.java

@@ -434,4 +434,16 @@ public class DisplaceAuditBpo {
     public int findCountByOld(String oldDisplace) {
 	    return displaceAuditDao.findCountByOld(oldDisplace);
     }
+
+	public String findSaleInfoBySaleId(String saleId){
+		return displaceAuditDao.findSaleInfoBySaleId(saleId);
+	}
+	public String findDisPlaceInfoById(String displaceId){
+		return displaceAuditDao.findDisPlaceInfoById(displaceId);
+	}
+	public DisplaceAuditBean queryAuditAllByDisplaceId(String displaceId){
+		return displaceAuditDao.queryAuditAllByDisplaceId(displaceId);
+	}
+
+
 }

src/main/java/com/agent/model/audit/dao/DisplaceAuditDao.java

@@ -963,11 +963,11 @@ public class DisplaceAuditDao<BaseBean> extends BaseDaoImpl<BaseBean> {
      */
     public boolean addInfoNew(DisplaceAuditBean bean){
         StringBuilder sql = new StringBuilder();
-        sql.append(" update "+CommonConstants.TB_DISPLACE_AUDIT +" set audit_status='1',audit_time=?,audit_user=?,up_type=?,bail=?,money_range=?,time_delay=?,start_time=?,end_time=?,min_money=?,is_kxc =?,min_price=?,max_price=?,persist_price=? where id=?");
+        sql.append(" update "+CommonConstants.TB_DISPLACE_AUDIT +" set audit_status='1',audit_time=?,audit_user=?,up_type=?,bail=?,money_range=?,time_delay=?,start_time=?,end_time=?,min_money=?,is_kxc =?,min_price=?,max_price=?,persist_price=?,if_deposit=?,ids=? where id=?");
         try {
             return super.updateBaseBean(sql.toString(), new Object[]{bean.getAuditTime(),bean.getAuditUser(),bean.getUpType(),CommonUtil.moneyToYuan(bean.getBail()),
                     CommonUtil.moneyToYuan(bean.getMoneyRange()),StringUtils.isBlank(bean.getTimeDelay())?0:bean.getTimeDelay(),bean.getStartTime(),bean.getEndTime(),
-                    CommonUtil.moneyToYuan(bean.getMinMoney()),bean.getIsKxc(),StringUtils.isBlank(bean.getMinPrice())?0:CommonUtil.moneyToYuan(bean.getMinPrice()),StringUtils.isBlank(bean.getMaxPrice())?0:CommonUtil.moneyToYuan(bean.getMaxPrice()),StringUtils.isBlank(bean.getPersistPrice())?0:CommonUtil.moneyToYuan(bean.getPersistPrice()),bean.getId()})>0;
+                    CommonUtil.moneyToYuan(bean.getMinMoney()),bean.getIsKxc(),StringUtils.isBlank(bean.getMinPrice())?0:CommonUtil.moneyToYuan(bean.getMinPrice()),StringUtils.isBlank(bean.getMaxPrice())?0:CommonUtil.moneyToYuan(bean.getMaxPrice()),StringUtils.isBlank(bean.getPersistPrice())?0:CommonUtil.moneyToYuan(bean.getPersistPrice()),bean.getIfDeposit(),bean.getIds(),bean.getId()})>0;
         } catch (Exception e) {
             logger.error("endTime error", e);
             return false;
@@ -1165,6 +1165,26 @@ public class DisplaceAuditDao<BaseBean> extends BaseDaoImpl<BaseBean> {
         return null;
     }
 
+    public DisplaceAuditBean queryAuditAllByDisplaceId(String displaceId) {
+
+        List<Object> params = new ArrayList<Object>();
+        StringBuffer sql = new StringBuffer();
+        sql.append(" select *");
+        sql.append(" from "+CommonConstants.TB_DISPLACE_AUDIT+" a  where 1 = 1  ");
+        System.out.println(sql.toString()+"======and a.displace_id = ="+displaceId);
+        // 审核id
+        if(StringUtils.isNotBlank(displaceId)){
+            sql.append(" and a.displace_id = ? ");
+            params.add(displaceId);
+        }
+
+        List<DisplaceAuditBean>  list = (List<DisplaceAuditBean>) super.getBaseBeans(sql.toString(), params.toArray(), displaceAuditBeanConvert);
+        if(list!=null && list.size() >0) {
+            return list.get(0);
+        }
+        return null;
+    }
+
     /**
      * 根据置换ID查询图片列表
      * @param displaceId
@@ -1212,4 +1232,39 @@ public class DisplaceAuditDao<BaseBean> extends BaseDaoImpl<BaseBean> {
         return a;
 
     }
+
+    /**
+     *  查询是否通票卖家
+     * @param id
+     * @return
+     */
+    public String findSaleInfoBySaleId(String saleId) {
+        StringBuffer sql=new StringBuffer();
+        sql.append("select plat_tp_set from tb_sales where sale_id='"+saleId+"'");
+        DisplaceAuditBean bean=this.getJdbcTemplate().queryForObject(sql.toString(), new RowMapper<DisplaceAuditBean>() {
+            @Override
+            public DisplaceAuditBean mapRow(ResultSet rs, int i) throws SQLException {
+                DisplaceAuditBean b=new DisplaceAuditBean();
+                b.setPaltTpSet(rs.getString("plat_tp_set"));
+                return b;
+            }
+        });
+
+        return bean.getPaltTpSet();
+    }
+
+    public String findDisPlaceInfoById(String displaceId) {
+        StringBuffer sql=new StringBuffer();
+        sql.append("select sale_id from tb_displace_audit where displace_id='"+displaceId+"'");
+        DisplaceAuditBean bean=this.getJdbcTemplate().queryForObject(sql.toString(), new RowMapper<DisplaceAuditBean>() {
+            @Override
+            public DisplaceAuditBean mapRow(ResultSet rs, int i) throws SQLException {
+                DisplaceAuditBean b=new DisplaceAuditBean();
+                b.setSaleId(rs.getString("sale_id"));
+                return b;
+            }
+        });
+
+        return bean.getSaleId();
+    }
 }

src/main/java/com/agent/model/audit/dao/convert/DisplaceAuditBeanConvert.java

@@ -47,6 +47,7 @@ public class DisplaceAuditBeanConvert  extends BaseIConvertBean{
 			bean.setMaxPrice(CommonUtil.moneyToWanYuan(super.getIntegerValue(map,"max_price")+""));
 			bean.setPersistPrice(CommonUtil.moneyToWanYuan(super.getIntegerValue(map,"persist_price")+""));
 			bean.setIs_good(super.getStringValue(map,"is_good"));
+			bean.setIds(super.getStringValue(map,"ids"));
 			// 是否结束
 			if(bean.getEndTime()!=null && bean.getEndTime().getTime() < System.currentTimeMillis()){
 				bean.setIsEnd("1");

src/main/java/com/agent/model/audit/service/DisplaceAuditService.java

@@ -1198,6 +1198,18 @@ public class DisplaceAuditService {
 		return displaceAuditBpo.updateAudit(id, warrantyDesc);
     }
 
+	public String findSaleInfoBySaleId(String saleId){
+		return displaceAuditBpo.findSaleInfoBySaleId(saleId);
+	}
+	public String findDisPlaceInfoById(String displaceId){
+		return displaceAuditBpo.findDisPlaceInfoById(displaceId);
+	}
+
+	public DisplaceAuditBean queryAuditAllByDisplaceId(String displaceId){
+		return displaceAuditBpo.queryAuditAllByDisplaceId(displaceId);
+	}
+
+
     /**
      * 推送信息
      * @param displaceId

src/main/java/com/agent/util/CommonUtil.java

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Formatter;
 import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -146,10 +147,16 @@ public class CommonUtil {
         if(StringUtils.isBlank(yuan)){
         	return "";
         }else{
-        	return Integer.parseInt(yuan)/10000.00 + "";
+        	Double du=(double)Integer.parseInt(yuan)/10000.00;
+			return format3(du);
         }
-    }  
-    
+    }
+	public static String format3(double value) {
+ /*
+  * %.2f % 表示 小数点前任意位数 2 表示两位小数 格式后的结果为 f 表示浮点型
+  */
+		return new Formatter().format("%.3f", value).toString();
+	}
     
     /**
      * 万元转为元

src/main/webapp/WEB-INF/views/audit/goodAdminAuditDetail.jsp

@@ -503,7 +503,7 @@
 					<input style="width: 160px;" readonly="readonly" autocomplete="off" name="pubTimeStr" type="hidden" value="${fn:replace(auditBean.pubTime,'.0','')}"  id="query_endTime" />
 					<td><input class="inputnone" type="text" style="width: 100px;" value="${auditBean.warrantyDesc}" maxlength="50" name="warrantyDesc" /></td>
 					<td><input class="inputnone" type="text" style="width: 200px;" value="${auditBean.othersDesc}" maxlength="100" name="othersDesc"  /></td>
-					<td><b class="td_b2" onclick="toSureAudit();">设备审核</b><!-- <b class="td_b2" onclick="backAuditList()">返回</b> --></td>
+					<td><b class="td_b2" onclick="toSureAuditGood('${auditBean.agentId}','${auditBean.saleId}');">设备审核</b><!-- <b class="td_b2" onclick="backAuditList()">返回</b> --></td>
 				</tr>
 				</form>
 			</table>

src/main/webapp/WEB-INF/views/sale/agent/salelist.jsp

@@ -94,7 +94,7 @@ var getHead={getSaleHead:function(obj){
 	if(obj["wxnc"]){
 		rowstr += "<th>微信昵称</th>";
 	}
-    rowstr += "<th rowspan='2'>注册时间</th>";
+    rowstr += "<th rowspan='1'>注册时间</th>";
 	if(obj["fzqy"]){
 		rowstr += "<th>负责区域</th>";
 	}

src/main/webapp/resources/js/audit/goodAudit.js

@@ -197,25 +197,28 @@ function showAuditDetail(auditId){
 		data:{'auditId':auditId},
 		dataType : 'json',
 		success:function(data){
+            $("#agent_rule_type").find('label').remove();
+            $("#agent_rule_type").find('span').remove();
+            var type='';
 			var auditBean = data.result;
 			if(!auditBean) {
 				tsalert("未查询到该记录！");
 			}else{
 				$("#id").val(auditBean.id);
 				$("#upType").val(auditBean.upType);
-				var type=auditBean.agentRule.split(",");
+				type=auditBean.agentRule.split(",");
 				console.log("====="+type.length);
 				var html='<span style="width:120px;">上架形式：</span>';
 				for(var i=0;i<type.length;i++){
                     console.log("====="+type[i]);
 					if("1"==type[i]){
-                        html+='<input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType1" name="upType" checked="checked" value="1" onchange="chooseType(this)"/>置换报价';
+                        html+='<label><input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType1" name="upType" checked="checked" value="1" onchange="chooseType(this)"/>置换报价</label>';
 					}
                     if("2"==type[i]){
-                        html+='<input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType2" name="upType" value="2" onchange="chooseType(this)"/>网络竞销';
+                        html+='<label><input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType2" name="upType" value="2" onchange="chooseType(this)"/>网络竞销</label>';
                     }
                     if("3"==type[i]){
-                        html+='<input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType3" name="upType" value="3" onchange="chooseType(this)"/>一口价秒杀';
+                        html+='<label><input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType3" name="upType" value="3" onchange="chooseType(this)"/>一口价秒杀</label>';
                     }
                     if(i==0){
                     	if(type[i]!=3){

src/main/webapp/resources/js/audit/superAdminAuditDetail.js

@@ -37,6 +37,41 @@ function toSureAudit(){
 	tanKuang($('#tishitc'));
 }
 
+function toSureAuditGood(agentId,saleId){
+    /*var id = $("#id").val();
+    var pro = $("#pro_"+id).val();
+    var city = $("#city_"+id).val();
+    var qx = $("#qx_"+id).val();
+    if(!pro || !city || !qx || pro.indexOf("请选择") != -1 || city.indexOf("请选择") != -1 || qx.indexOf("请选择") != -1) {
+        tsalert("请补充完整设备所在地信息！");
+        return;
+    }*/
+    //校验用户是否实名认证
+    url = ctx + '/auditDetail/checkUser.do';
+    $.ajax({
+        url:url,
+        type:'post',
+        data:{
+            agentId:agentId,
+            saleId:saleId,
+		},
+        dataType : 'json',
+        success:function(data){
+            console.log("data="+data);
+            if(data){
+                tanKuang($('#tishitc'));
+			}else{
+            	alert("卖家身份未确认");
+			}
+        },
+        error:function(){
+
+        }
+    });
+
+
+}
+
 /**	
  * 修改图片信息等
  */

src/main/webapp/resources/js/index.js

@@ -1,6 +1,6 @@
 //弹框动画
 function tanKuang(class1){
-    setTimeout(function(){alert($(".sharebg").length);
+    setTimeout(function(){
         class1.addClass("am-acti-active");  
         if($(".sharebg").length>0){
             $(".sharebg").addClass("sharebg-active");