1

uni_applet/pages/food/food.vue

@@ -270,7 +270,9 @@
 							that.handleList[i].longitude=that.handleList[i].location.split(',')[1]
 							var data=await that.getDistance(that.handleList[i].latitude,that.handleList[i].longitude) 
 							that.handleList[i].distance=(data.distance/1000).toFixed(2)
-							that.handleList[i].labels = that.handleList[i].label.split(",")
+							if(that.handleList[i].label){
+								that.handleList[i].labels = that.handleList[i].label.split(",")
+							}
 							if(i==that.handleList.length-1){
 								setTimeout(()=>{
 									console.log(that.handleList)

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/IFoodInfoService.java

@@ -42,8 +42,8 @@ public interface IFoodInfoService{
 							@HttpParam(name = "businessLicense", type = HttpParamType.COMMON, description = "营业执照") String businessLicense,
 							@HttpParam(name = "operateCertificate", type = HttpParamType.COMMON, description = "经营许可证") String operateCertificate,
 							@HttpParam(name = "operateCertificateDate", type = HttpParamType.COMMON, description = "经营许可证有效期") Date operateCertificateDate,
-							@HttpParam(name = "startDate", type = HttpParamType.COMMON, description = "营业开始时间") Date startDate,
-							@HttpParam(name = "endDate", type = HttpParamType.COMMON, description = "营业结束时间") Date endDate,
+							@HttpParam(name = "startDate", type = HttpParamType.COMMON, description = "营业开始时间") String startDate,
+							@HttpParam(name = "endDate", type = HttpParamType.COMMON, description = "营业结束时间") String endDate,
 							@HttpParam(name = "lookFlag", type = HttpParamType.COMMON, description = "允许用户查看菜品价格(0允许1禁止)") Long lookFlag,
 							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
@@ -82,8 +82,8 @@ public interface IFoodInfoService{
 							@HttpParam(name = "businessLicense", type = HttpParamType.COMMON, description = "营业执照") String businessLicense,
 							@HttpParam(name = "operateCertificate", type = HttpParamType.COMMON, description = "经营许可证") String operateCertificate,
 							@HttpParam(name = "operateCertificateDate", type = HttpParamType.COMMON, description = "经营许可证有效期") Date operateCertificateDate,
-							@HttpParam(name = "startDate", type = HttpParamType.COMMON, description = "营业开始时间") Date startDate,
-							@HttpParam(name = "endDate", type = HttpParamType.COMMON, description = "营业结束时间") Date endDate,
+							@HttpParam(name = "startDate", type = HttpParamType.COMMON, description = "营业开始时间") String startDate,
+							@HttpParam(name = "endDate", type = HttpParamType.COMMON, description = "营业结束时间") String endDate,
 							@HttpParam(name = "lookFlag", type = HttpParamType.COMMON, description = "允许用户查看菜品价格(0允许1禁止)") Long lookFlag,
 							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/FoodInfoServiceImpl.java

@@ -42,7 +42,7 @@ public class FoodInfoServiceImpl implements IFoodInfoService{
 	}
 
 	@Override
-	public Page<FoodInfo> list(Long commonId,String mainBody,String shopNames,String coverImage,String indoorImage,String province,String city,String area,String location,String detailedAddress,String operater,String operaterPhone,String contacts,String contactsPhone,String label,String businessLicense,String operateCertificate,Date operateCertificateDate,Date startDate,Date endDate,Long lookFlag,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<FoodInfo> list(Long commonId,String mainBody,String shopNames,String coverImage,String indoorImage,String province,String city,String area,String location,String detailedAddress,String operater,String operaterPhone,String contacts,String contactsPhone,String label,String businessLicense,String operateCertificate,Date operateCertificateDate,String startDate,String endDate,Long lookFlag,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<FoodInfo> wrapper = new EntityWrapper<FoodInfo>();
 														if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
@@ -152,7 +152,7 @@ public class FoodInfoServiceImpl implements IFoodInfoService{
 	}
 	
 	@Override
-	public String export(Long commonId,String mainBody,String shopNames,String coverImage,String indoorImage,String province,String city,String area,String location,String detailedAddress,String operater,String operaterPhone,String contacts,String contactsPhone,String label,String businessLicense,String operateCertificate,Date operateCertificateDate,Date startDate,Date endDate,Long lookFlag,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public String export(Long commonId,String mainBody,String shopNames,String coverImage,String indoorImage,String province,String city,String area,String location,String detailedAddress,String operater,String operaterPhone,String contacts,String contactsPhone,String label,String businessLicense,String operateCertificate,Date operateCertificateDate,String startDate,String endDate,Long lookFlag,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<FoodInfo> wrapper = new EntityWrapper<FoodInfo>();
 														if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);

unimall-data/src/main/java/com/iotechn/unimall/data/domain/FoodInfo.java

@@ -118,14 +118,14 @@ public class FoodInfo extends SuperDO{
     private Date operateCertificateDate;
 
     /** 营业开始时间 */
-    @Excel(name = "营业开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "营业开始时间")
     @TableField("start_date")
-    private Date startDate;
+    private String startDate;
 
     /** 营业结束时间 */
-    @Excel(name = "营业结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "营业结束时间")
     @TableField("end_date")
-    private Date endDate;
+    private String endDate;
 
     /** 允许用户查看菜品价格(0允许1禁止) */
     @Excel(name = "允许用户查看菜品价格(0允许1禁止)")