pc端上架审核小数点后三位

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

@@ -8,6 +8,8 @@ import com.agent.model.audit.bean.*;
 import com.agent.model.audit.service.DisplaceAuditService;
 import com.agent.model.bms.bean.UserBean;
 import com.agent.model.bms.service.BaseLoginService;
+import com.agent.model.certification.bean.Explain;
+import com.agent.model.certification.service.ExplainService;
 import com.agent.model.common.bean.PageResultBean;
 import com.agent.model.common.bean.RegionBean;
 import com.agent.model.common.bean.ResultBean;
@@ -38,6 +40,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -157,6 +160,9 @@ public class AuditDetailController extends AbstractController{
     @Autowired
     private BaseLoginService baseLoginService;
 
+	@Autowired
+	private ExplainService explainService;
+
     @Value("${wjj.api.domain}")
 	private String apiDomain;
 
@@ -166,6 +172,8 @@ public class AuditDetailController extends AbstractController{
 
 
 
+
+
 	/**
 	 * 载入置换审核详情
 	 * @param request
@@ -1364,21 +1372,25 @@ public class AuditDetailController extends AbstractController{
 				if(StringUtils.isNotBlank(saleId_f)) {
 					SalesBean salesBean = saleBeanService.getSaleBeanBySaleId(saleId_f);
 					if(salesBean != null){
+						Date date = new Date();
+						String str = "yyyy年MM月dd日 HH:mm";
+						SimpleDateFormat sdf = new SimpleDateFormat(str);
 						String openId = salesBean.getWxOpenid();
 						String wxnc = salesBean.getSaleWxnc();
 						String wxh = salesBean.getSaleWxh();
 						String name = salesBean.getSaleName();
 						String phone = salesBean.getSalePhone();
+						Explain explain=explainService.findAll().get(0);
 						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 +"&displaceId=" + displaceId;
 						// 组装销售员微信内容
 						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"));
+						param2.put("keyword1",new TemplateData(displaceAuditBean.getDisplaceId(),"#696969"));
+						param2.put("keyword2",new TemplateData(sdf.format(date),"#696969"));
+						param2.put("keyword3",new TemplateData("待确认","#696969"));
+						param2.put("keyword4",new TemplateData(explain.getDeposit()+"元","#696969"));
 
 						String upsms = TemplateConstants.ZHSH_SALE_UP_SMS;
 						upsms = upsms.replace("sbmc", sbmc);
@@ -1395,7 +1407,7 @@ public class AuditDetailController extends AbstractController{
                 			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, "审核结果通知");
+								appId, appSecret, upsms, wxsms1, param2, saleUrl, "订单待确认通知");
 						list.add(pushRecord);
 					}
 				}
@@ -1834,21 +1846,25 @@ public class AuditDetailController extends AbstractController{
 				if(StringUtils.isNotBlank(saleId_f)) {
 					SalesBean salesBean = saleBeanService.getSaleBeanBySaleId(saleId_f);
 					if(salesBean != null){
+						Date date = new Date();
+						String str = "yyyy年MM月dd日 HH:mm";
+						SimpleDateFormat sdf = new SimpleDateFormat(str);
 						String openId = salesBean.getWxOpenid();
 						String wxnc = salesBean.getSaleWxnc();
 						String wxh = salesBean.getSaleWxh();
 						String name = salesBean.getSaleName();
 						String phone = salesBean.getSalePhone();
+						Explain explain=explainService.findAll().get(0);
 						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 +"&displaceId=" + displaceId;
 						// 组装销售员微信内容
 						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"));
+						param2.put("keyword1",new TemplateData(displaceAuditBean.getDisplaceId(),"#696969"));
+						param2.put("keyword2",new TemplateData(sdf.format(date),"#696969"));
+						param2.put("keyword3",new TemplateData("待确认","#696969"));
+						param2.put("keyword4",new TemplateData(explain.getDeposit()+"元","#696969"));
 
 						String upsms = TemplateConstants.ZHSH_SALE_UP_SMS;
 						upsms = upsms.replace("sbmc", sbmc);
@@ -1866,7 +1882,7 @@ public class AuditDetailController extends AbstractController{
                     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, "审核结果通知");
+                			appId, appSecret, upsms, wxsms1, param2, saleUrl, "订单待确认通知");
                     	list.add(pushRecord);
 
                     	//icegan--销售员如果有交担保金，则升级为贵宾会员

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

@@ -458,7 +458,7 @@ type="text/javascript"></script> --%>
                         auditTime = audit[0] + "<br>" + audit[1];
                     }
 
-                    rowstr += "<td><span>" +body.ideaPrice+ "</span></td>" + "<td><span>" +pubTime+ "</span></td>"
+                    rowstr += "<td><span>" +parseFloat(body.ideaPrice)+ "</span></td>" + "<td><span>" +pubTime+ "</span></td>"
                         + "<td><span>" +auditTime+ "</span></td>" + "<td><span>" +body.journalistName+ "</span></td>"
                         + "<td><span>" +body.journalistTel+ "</span></td>";
                     var subMenuHtml = "";