Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

高敬炎 2 years ago
parent
commit
7935db93c7

+ 55 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/IPhoneRecordInfoService.java

@@ -0,0 +1,55 @@
+package com.iotechn.unimall.admin.api.tourism;
+
+
+import com.iotechn.unimall.data.domain.PhoneRecordInfo;
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 拨打电话记录Service接口
+ * 
+ * @author jlb
+ * @date 2023-06-25
+ */
+@HttpOpenApi(group = "admin.tourism.phoneRecordInfo", description = "拨打电话记录")
+public interface IPhoneRecordInfoService{
+	@HttpMethod(description = "新增",   permissionName = "拨打电话记录管理")
+	public Boolean add(@NotNull @HttpParam(name = "phoneRecordInfo", type = HttpParamType.COMMON, description = "拨打电话记录") PhoneRecordInfo phoneRecordInfo)throws ServiceException;
+
+	@HttpMethod(description = "列表", permissionName = "拨打电话记录管理")
+	public Page<PhoneRecordInfo> list(
+								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "操作人id") Long commonId,
+							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
+										@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除",permissionName = "拨打电话记录管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改",  permissionName = "拨打电话记录管理")
+	public Boolean update(@NotNull @HttpParam(name = "phoneRecordInfo", type = HttpParamType.COMMON, description = "拨打电话记录") PhoneRecordInfo phoneRecordInfo)throws ServiceException;
+
+	@HttpMethod(description = "查询", permissionName = "拨打电话记录管理")
+	public PhoneRecordInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表",  permissionName = "拨打电话记录管理")
+	public String export(
+								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "操作人id") Long commonId,
+							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
+										@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

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

@@ -201,6 +201,13 @@ public class FoodInfoServiceImpl implements IFoodInfoService {
 			//查询发货地经纬度
 			for (int i = 0; i < list.size(); i++) {
 				FoodInfo foodInfo = list.get(i);
+				List<FoodDishesInfo> foodDishesInfoList = foodDishesInfoMapper.selectList(new EntityWrapper<FoodDishesInfo>()
+						.eq("food_id",foodInfo.getId())
+						.orderBy("top_marking",false).orderBy("gmt_create",false));
+				if (!CollectionUtils.isEmpty(foodDishesInfoList)){
+					foodInfo.setFoodDishesInfoList(foodDishesInfoList);
+				}
+
 				//根据用户经纬度求距离
 				if (!StringUtils.isEmpty(userLatitude) && !StringUtils.isEmpty(userLongitude)) {
 					 // 参数解释:lng:经度,lat:维度。KEY:腾讯地图key

+ 140 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/PhoneRecordInfoServiceImpl.java

@@ -0,0 +1,140 @@
+package com.iotechn.unimall.admin.api.tourism.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+
+import com.iotechn.unimall.core.exception.AppServiceException;
+import com.iotechn.unimall.core.exception.ExceptionDefinition;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import com.iotechn.unimall.data.mapper.PhoneRecordInfoMapper;
+import com.iotechn.unimall.data.domain.PhoneRecordInfo;
+import com.iotechn.unimall.admin.api.tourism.IPhoneRecordInfoService;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 拨打电话记录Service业务层处理
+ * 
+ * @author jlb
+ * @date 2023-06-25
+ */
+@Service
+public class PhoneRecordInfoServiceImpl implements IPhoneRecordInfoService{
+	@Autowired
+	private PhoneRecordInfoMapper phoneRecordInfoMapper;
+	
+	@Override
+	public Boolean add(PhoneRecordInfo phoneRecordInfo) throws ServiceException {
+		Date now = new Date();
+		Calendar calendar = Calendar.getInstance();
+		//一小时之前的时间
+		calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 1);
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String time=df.format(calendar.getTime());
+		Calendar calendar1 = Calendar.getInstance();
+		//一天前的时间
+		calendar1.setTime(now);
+		calendar1.add(Calendar.DAY_OF_MONTH, -1);
+		String time1=df.format(calendar1.getTime());
+		List<PhoneRecordInfo> phoneRecordInfoList=phoneRecordInfoMapper.selectList(new EntityWrapper<PhoneRecordInfo>()
+			.eq("phone",phoneRecordInfo.getPhone())
+			.eq("common_id",phoneRecordInfo.getCommonId())
+			.gt("gmt_create",time));
+		if (phoneRecordInfoList.size()>10){
+			throw new AppServiceException(ExceptionDefinition.OPERATE_FREQUENTLY_ERROR);
+		}
+		List<PhoneRecordInfo> phoneRecordInfoList1=phoneRecordInfoMapper.selectList(new EntityWrapper<PhoneRecordInfo>()
+				.eq("phone",phoneRecordInfo.getPhone())
+				.eq("common_id",phoneRecordInfo.getCommonId())
+				.gt("gmt_create",time1));
+		if (phoneRecordInfoList1.size()>20){
+			throw new AppServiceException(ExceptionDefinition.OPERATE_FREQUENTLY_ERROR);
+		}
+		phoneRecordInfo.setGmtCreate(now);
+		phoneRecordInfo.setGmtUpdate(now);
+		return phoneRecordInfoMapper.insert(phoneRecordInfo)>0;
+	}
+
+	@Override
+	public Page<PhoneRecordInfo> list(Long commonId,String phone,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+		Wrapper<PhoneRecordInfo> wrapper = new EntityWrapper<PhoneRecordInfo>();
+														if (!StringUtils.isEmpty(commonId)) {
+					wrapper.eq("common_id", commonId);
+				}
+												if (!StringUtils.isEmpty(phone)) {
+					wrapper.eq("phone", phone);
+				}
+																	if (!StringUtils.isEmpty(gmtCreate)) {
+					wrapper.eq("gmt_create", gmtCreate);
+				}
+												if (!StringUtils.isEmpty(gmtUpdate)) {
+					wrapper.eq("gmt_update", gmtUpdate);
+				}
+												if (!StringUtils.isEmpty(deleteFlag)) {
+					wrapper.eq("delete_flag", deleteFlag);
+				}
+							wrapper.eq("delete_flag", 0);
+		List<PhoneRecordInfo> list = phoneRecordInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		Integer count = phoneRecordInfoMapper.selectCount(wrapper);
+		return new Page<PhoneRecordInfo>(list, page, limit, count);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean delete(String id) {
+		String[] ids = String.valueOf(id).split(",");
+		for (String tt:ids) {
+			PhoneRecordInfo tmp =  phoneRecordInfoMapper.selectById(Long.parseLong(tt));
+			if(tmp != null){
+				tmp.setDeleteFlag(1l);
+				phoneRecordInfoMapper.updateById(tmp);
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean update(PhoneRecordInfo phoneRecordInfo) throws ServiceException {
+		Date now = new Date();
+		phoneRecordInfo.setGmtUpdate(now);
+		return phoneRecordInfoMapper.updateById(phoneRecordInfo)>0;
+	}
+
+	@Override
+	public PhoneRecordInfo get(Long id) throws ServiceException {
+		return phoneRecordInfoMapper.selectById(id);
+	}
+	
+	@Override
+	public String export(Long commonId,String phone,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+		Wrapper<PhoneRecordInfo> wrapper = new EntityWrapper<PhoneRecordInfo>();
+														if (!StringUtils.isEmpty(commonId)) {
+					wrapper.eq("common_id", commonId);
+				}
+												if (!StringUtils.isEmpty(phone)) {
+					wrapper.eq("phone", phone);
+				}
+																	if (!StringUtils.isEmpty(gmtCreate)) {
+					wrapper.eq("gmt_create", gmtCreate);
+				}
+												if (!StringUtils.isEmpty(gmtUpdate)) {
+					wrapper.eq("gmt_update", gmtUpdate);
+				}
+												if (!StringUtils.isEmpty(deleteFlag)) {
+					wrapper.eq("delete_flag", deleteFlag);
+				}
+							List<PhoneRecordInfo> list = phoneRecordInfoMapper.selectList(wrapper);
+		ExcelUtil<PhoneRecordInfo> util = new ExcelUtil<PhoneRecordInfo>(PhoneRecordInfo.class);
+		return util.exportExcel(list, "操作日志");
+	}
+}

+ 1 - 1
unimall-admin/config/index.js

@@ -15,7 +15,7 @@ module.exports = {
 
         // can be overwritten by process.env.HOST
         // if you want dev by ip, please set host: '0.0.0.0'
-        host: '192.168.110.72',
+        host: '192.168.110.138',
         port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
         autoOpenBrowser: true,
         errorOverlay: true,

+ 2 - 0
unimall-core/src/main/java/com/iotechn/unimall/core/exception/ExceptionDefinition.java

@@ -385,6 +385,8 @@ public class ExceptionDefinition {
     public static final ServiceExceptionDefinition TABLE_IMPORT_ERROR=
             new ServiceExceptionDefinition(53017, "导入表失败");
 
+    public static final ServiceExceptionDefinition OPERATE_FREQUENTLY_ERROR=
+            new ServiceExceptionDefinition(53018, "操作频繁,请稍后再试");
 
 
     public static ServiceExceptionDefinition buildVariableException(ServiceExceptionDefinition definition, String ...args) {

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

@@ -173,6 +173,8 @@ public class FoodInfo extends SuperDO{
     private List<DishClassifyInfo> dishClassifyInfoList;
     @TableField(exist = false)
     private List<FoodGroupInfo> foodGroupInfoList;
+    @TableField(exist = false)
+    private List<FoodDishesInfo> foodDishesInfoList;
     /** 团购数 */
     @TableField(exist = false)
     private Integer groupNum;

+ 73 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/PhoneRecordInfo.java

@@ -0,0 +1,73 @@
+package com.iotechn.unimall.data.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 拨打电话记录对象 phone_record_info
+ * 
+ * @author jlb
+ * @date 2023-06-25
+ */
+@Data
+@TableName("phone_record_info")
+public class PhoneRecordInfo extends SuperDO{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /** 操作人id */
+    @Excel(name = "操作人id")
+    @TableField("common_id")
+    private Long commonId;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    @TableField("phone")
+    private String phone;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("remark")
+    private String remark;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /** 删除标识 */
+    @Excel(name = "删除标识")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("commonId", getCommonId())
+            .append("phone", getPhone())
+            .append("remark", getRemark())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("deleteFlag", getDeleteFlag())
+            .toString();
+    }
+}

+ 13 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/mapper/PhoneRecordInfoMapper.java

@@ -0,0 +1,13 @@
+package com.iotechn.unimall.data.mapper;
+
+import com.iotechn.unimall.data.domain.PhoneRecordInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+/**
+ * 拨打电话记录Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-06-25
+ */
+public interface PhoneRecordInfoMapper extends BaseMapper<PhoneRecordInfo>{
+
+}

+ 9 - 0
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/PhoneRecordInfoMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iotechn.unimall.data.mapper.PhoneRecordInfoMapper">
+    
+
+
+</mapper>

+ 2 - 2
unimall-launcher/src/main/resources/application.properties

@@ -86,8 +86,8 @@ oss.aliyun.oss.basekUrl=https://taohaoliang.oss-cn-beijing.aliyuncs.com/
 ########################################################
 ### 微信 小程序、APP、H5信息
 ########################################################
-com.iotechn.unimall.wx.mini.app-id=wx5d8906c2208c899f
-com.iotechn.unimall.wx.mini.app-secret=cbb2ea3ee48bb0b0f5baa9f6c51473c1
+com.iotechn.unimall.wx.mini.app-id=wxa88225ca7712d558
+com.iotechn.unimall.wx.mini.app-secret=e34069a3534e90ff54ed8137694614c4
 
 com.iotechn.unimall.wx.app.app-id=wxe3c17ca92931512d
 com.iotechn.unimall.wx.app.app-secret=049151cd78f6671a27704be472832ff1