Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/StoreFieldEnum.java

@@ -8,27 +8,27 @@ package com.gic.haoban.manage.api.enums;
 public enum StoreFieldEnum {
 
 	//门店名称
-    STORE_NAME(1),
+    STORE_NAME("1"),
 	//门店面积
-    STORE_AREA(2),
+    STORE_AREA("2"),
 	//联系电话
-    CONACTS_PHONE(3),
+    CONACTS_PHONE("3"),
     //营业时间
-    BUSINESS_TIME_STRING(4),
+    BUSINESS_TIME_STRING("4"),
     //门店地址
-    STORE_ADDRESS(5),
+    STORE_ADDRESS("5"),
     //门店图片
-    STORE_IMAG(6);
+    STORE_IMAG("6");
     /**
      * 类型
      */
-    private Integer value;
+    private String value;
 
-    StoreFieldEnum(Integer value) {
+    StoreFieldEnum(String value) {
         this.value = value;
     }
 
-    public Integer getValue() {
+    public String getValue() {
         return value;
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -8,6 +8,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +41,8 @@ import com.github.pagehelper.PageHelper;
  */
 @Service
 public class AuditApiServiceImpl implements AuditApiService{
+	private static Logger logger  = LoggerFactory.getLogger(AuditApiServiceImpl.class);
+
 	@Autowired
 	private TabHaobanAuditMapper auditMapper;
 	@Autowired
@@ -123,17 +127,21 @@ public class AuditApiServiceImpl implements AuditApiService{
 	@Override
 	public void editStoreInfo(String storeId, String changeField,
 			String oldValue, String newValue) {
+		logger.info("===================进11");
 		StoreDTO store = storeService.getStore(storeId);
 		if(!StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)){
 			 //非门店图片修改
+			logger.info("===================进222");
 			getStoreDTO( store, changeField, oldValue, newValue);
 			storeService.saveOrUpdateStore(store);
 		 }else{
 			 //门店图片修改
+				logger.info("===================进333");
 			 storeService.updateStorePhotos(storeId, newValue);
 		 }		
 	}
 	void getStoreDTO(StoreDTO store,String changeField,String oldValue,String newValue){
+		logger.info("==========================>changeField={}",changeField);
 		if(StoreFieldEnum.BUSINESS_TIME_STRING.getValue().equals(changeField)){
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
 			//营业时间
@@ -158,10 +166,12 @@ public class AuditApiServiceImpl implements AuditApiService{
 			//联系电话
 			store.setConactsPhone(newValue);
 		}else if(StoreFieldEnum.STORE_ADDRESS.getValue().equals(changeField)){
+			logger.info("==========================>进来333");
 			//门店地址
 			StoreAddressDTO obj = JSONObject.parseObject(newValue,StoreAddressDTO.class);
 			String areaId = obj.getAreaId();
 			String storeAddress = obj.getStoreAddress();
+			logger.info("==========================>areaId={},storeAddress={},newValue={}",areaId,storeAddress,newValue);
 			String arr[] = storeAddress.split(" ");
 			store.setAreaId(areaId);
 			store.setFullArea(arr[0]);

haoban-manage3-service/src/main/resources/mapper/AuditSettingMapper.xml

@@ -107,7 +107,7 @@
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_audit_setting
-    where  wx_enteprise_id = #{wxEntepriseId,jdbcType=VARCHAR}
+    where  wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
     	and status_flag = 1
   </select>
   

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

 package com.gic.haoban.manage.web.controller;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -12,6 +11,8 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,7 +21,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
@@ -37,10 +37,7 @@ import com.gic.haoban.data.api.service.HaobanDataApiService;
 import com.gic.haoban.manage.api.dto.AuditSettingDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
-import com.gic.haoban.manage.api.dto.StoreAddressDTO;
-import com.gic.haoban.manage.api.enums.StoreFieldEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.AuditSettingApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
@@ -49,12 +46,13 @@ import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.vo.ClerkVo;
 import com.gic.haoban.manage.web.vo.StoreDetailVO;
 import com.gic.haoban.manage.web.vo.StoreVO;
 
 @RestController
 public class StoreController extends WebBaseController{
+	private static Logger logger  = LoggerFactory.getLogger(StoreController.class);
+
 	@Autowired
 	private ClerkService clerkService;
 	@Autowired
@@ -229,22 +227,33 @@ public class StoreController extends WebBaseController{
 	}
 	//修改门店数据
 	@RequestMapping("/change-store-detail")
-	public HaobanResponse saleDate(String wxEnterpriseId,String storeId,String staffId,String changeField,String oldValue,String newValue) {
-		if(StringUtils.isAnyBlank(wxEnterpriseId,storeId,changeField,oldValue,newValue)){
+	public HaobanResponse changeStoreDetail(String wxEnterpriseId,String storeId,String staffId,String changeField,String oldValue,String newValue) {
+		if(StringUtils.isAnyBlank(wxEnterpriseId,storeId,changeField)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		if(StringUtils.isBlank(oldValue)){
+			oldValue = "";
+		}
+		if(StringUtils.isBlank(newValue)){
+			newValue = "";
+		}
 		StoreDTO store = storeService.getStore(storeId);
 		String enterpriseId = store.getEnterpriseId();
+		logger.info("==================aaaa");
 		AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
+		logger.info("==================bbb");
 		//默认不审核
 		int auditFlag = 0;
 		if(auditSettingDTO != null){
 			auditFlag = auditSettingDTO.getAuditFlag();
 		}
+		logger.info("==================auditFlag={}",auditFlag);
 		if(auditFlag == 1){
 			//要审核
+			logger.info("==================11111");
 			int i = auditApiService.save(1, enterpriseId, staffId, storeId, changeField, oldValue, newValue);
 		}else{
+			logger.info("==================22222");
 			auditApiService.editStoreInfo(storeId, changeField, oldValue, newValue);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);