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/dto/WxEnterpriseDTO.java

@@ -62,10 +62,20 @@ public class WxEnterpriseDTO implements Serializable {
     private Date createTime;
 
     private Date updateTime;
+    //小程序版本
+    private String smallVersion;
 
     private static final long serialVersionUID = 1L;
 
-    public String getWxEnterpriseId() {
+    public String getSmallVersion() {
+		return smallVersion;
+	}
+
+	public void setSmallVersion(String smallVersion) {
+		this.smallVersion = smallVersion;
+	}
+
+	public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }
 

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

@@ -60,8 +60,12 @@ public class AuditController extends WebBaseController{
 		if(StringUtils.isAnyBlank(wxEnterpriseId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
-		return resultResponse(HaoBanErrCode.ERR_1);
+		AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
+		if(auditSettingDTO == null){
+			auditSettingDTO = new AuditSettingDTO();
+			auditSettingDTO.setAuditFlag(1);
+		}
+		return resultResponse(HaoBanErrCode.ERR_1,auditSettingDTO);
 	}
 	//分页查找
 	@RequestMapping("find-page")

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

@@ -87,6 +87,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
+		wxEnterpriseDTO.setSmallVersion("免费版");
 		return resultResponse(HaoBanErrCode.ERR_1,wxEnterpriseDTO);
 	}
 	

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

@@ -179,7 +179,7 @@ public class StoreController extends WebBaseController{
 		HaobanDataDTO HaobanDataDTO = haobanDataApiService.getSaleDataByDate(enterpriseId, storeId, date);
 		return resultResponse(HaoBanErrCode.ERR_1,HaobanDataDTO);
 	}
-	//获取首页销售数据
+	//获取省市区
 	@IgnoreLogin
 	@RequestMapping("/get-area-list")
 	public HaobanResponse getArea(Integer type,String id) {
@@ -244,8 +244,8 @@ public class StoreController extends WebBaseController{
 		logger.info("==================aaaa");
 		AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
 		logger.info("==================bbb");
-		//默认不审核
-		int auditFlag = 0;
+		//默认开启审核
+		int auditFlag = 1;
 		if(auditSettingDTO != null){
 			auditFlag = auditSettingDTO.getAuditFlag();
 		}