111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditDTO.java

@@ -40,9 +40,19 @@ public class AuditDTO implements Serializable {
 
     private Integer statusFlag;
 
+    private String detail;
+
     private static final long serialVersionUID = 1L;
 
-    public String getAuditId() {
+    public String getDetail() {
+		return detail;
+	}
+
+	public void setDetail(String detail) {
+		this.detail = detail;
+	}
+
+	public String getAuditId() {
         return auditId;
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -3,11 +3,13 @@ package com.gic.haoban.manage.web.controller;
 import java.util.List;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.GlobalVar;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.enums.StoreFieldEnum;
 import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.AuditSettingApiService;
@@ -77,6 +79,33 @@ public class AuditController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		Page<AuditDTO> page = auditApiService.page(auditType, search, wxEnterpriseId,enterpriseId, auditStatus, pageInfo);
+		List<AuditDTO> list = page.getResult();
+		for(AuditDTO dto:list){
+			String t = dto.getChangeField();
+			String detail = "";
+			if(StoreFieldEnum.STORE_NAME.getValue().equals(t)){
+				detail = "将"+"门店名称"+dto.getOldValue()+"修改为"+dto.getNewValue();
+			}else if(StoreFieldEnum.STORE_AREA.getValue().equals(t)){
+				detail = "将"+"门店面积"+dto.getOldValue()+"修改为"+dto.getNewValue();
+			}else if(StoreFieldEnum.CONACTS_PHONE.getValue().equals(t)){
+				detail = "将"+"联系电话"+dto.getOldValue()+"修改为"+dto.getNewValue();
+			}else if(StoreFieldEnum.BUSINESS_TIME_STRING.getValue().equals(t)){
+				detail = "将"+"营业时间"+dto.getOldValue()+"修改为"+dto.getNewValue();
+			}else if(StoreFieldEnum.STORE_ADDRESS.getValue().equals(t)){
+				String oldValue = dto.getOldValue();
+				String newValue = dto.getNewValue();
+				JSONObject oldJSONObject = JSONObject.parseObject(oldValue);
+				String oldAddress = oldJSONObject.get("storeAddress").toString();
+				
+				JSONObject newJSONObject = JSONObject.parseObject(newValue);
+				String newAddress = newJSONObject.get("storeAddress").toString();
+				detail = "将"+"门店地址"+oldAddress+"修改为"+newAddress;
+			}else if(StoreFieldEnum.STORE_IMAG.getValue().equals(t)){
+				detail = "门店图片变更";
+			}
+			dto.setDetail(detail);
+		}
+		page.setResult(list);
 		return resultResponse(HaoBanErrCode.ERR_1,page);
 	}
 	//审核拒绝