Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

README.md

@@ -161,6 +161,64 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 | 基础UI库  | uViewui | 基础框架 | uni-app |
 | CSS预处理 | scss    | 地图引擎 | amap    |
 
+### 升级计划
+
+时间：2021年6月15日
+
+```
+新增功能：
+1.微信小程序直播
+2.优惠券活动
+3.新人赠券
+4.准确发券
+5.用户等级
+6.数据导出
+7.订单批量
+8.APP版本升级检测
+9.积分商城
+
+功能优化：
+1.优惠券有效期增加类型：设置领取后*内有效。
+2.秒杀活动设置为每天开启，需设置秒杀活动开启时间。
+3.店铺配送模板，配送地区如果选择省份则下方的市级地址不展示。
+4.店铺配送模板支持，店铺包邮。
+5.普通商品设置去除卖家承担运费。
+
+```
+
+时间：2021年7月15日
+
+```
+新增功能：
+1.会员权益
+2.支持用户升级会员
+3.供求单
+4.IM：腾讯云智服
+5.服务商品
+6.店铺支持订单核销
+7.店铺自提点
+功能优化：
+1.用户分享商城、关注店铺、邀请新用户可获取积分、经验值。
+```
+
+时间：2021年8月16日
+
+```
+新增功能：
+1.微淘功能
+2.店铺移动端
+3.店铺发货单
+```
+
+时间：2021年9月15日
+
+```
+新增功能：
+增加供应商功能
+```
+
+
+
 ### 技术亮点
 
 

buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java

@@ -0,0 +1,36 @@
+package cn.lili.controller.other;
+
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.system.service.AppVersionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 买家端,APP版本
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/21 11:15 上午
+ */
+@RestController
+@Api(tags = "买家端,APP版本")
+@RequestMapping("/buyer/appVersion")
+public class AppVersionBuyerController {
+
+    @Autowired
+    private AppVersionService appVersionService;
+
+
+    @ApiOperation(value = "获取版本号")
+    @ApiImplicitParam(name = "appType", value = "app类型", required = true, paramType = "path")
+    @GetMapping("/{appType}")
+    public ResultMessage<Object> getAppVersion(@PathVariable String appType) {
+        return ResultUtil.data(appVersionService.getAppVersion(appType));
+    }
+}

buyer-api/src/main/resources/application.yml

@@ -152,9 +152,7 @@ ignored:
     - /buyer/promotion/seckill
     - /buyer/memberEvaluation/**/goodsEvaluation
     - /buyer/memberEvaluation/**/evaluationNumber
-    - /store/login/**
-    - /manager/user/login
-    - /manager/user/refresh/**
+    - /buyer/appVersion/**
     - /druid/**
     - /swagger-ui.html
     - /doc.html

config/application.yml

@@ -149,6 +149,7 @@ ignored:
     - /buyer/promotion/pointsGoods/**
     - /buyer/memberEvaluation/**/goodsEvaluation
     - /buyer/memberEvaluation/**/evaluationNumber
+    - /buyer/appVersion/**
     - /store/login/**
     - /manager/user/login
     - /manager/user/refresh/**

framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java

@@ -30,7 +30,7 @@ import java.util.Date;
 @Table(name = "li_app_version")
 @TableName("li_app_version")
 @ApiModel(value = "app版本控制")
-public class AppVersionDO{
+public class AppVersion {
 
     private static final long serialVersionUID = 3034686331756935L;
 

framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java

@@ -1,7 +1,8 @@
 package cn.lili.modules.system.mapper;
 
-import cn.lili.modules.system.entity.dos.AppVersionDO;
+import cn.lili.modules.system.entity.dos.AppVersion;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * app版本控制数据处理层
@@ -9,6 +10,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author Chopper
  * @date 2020/11/17 8:01 下午
  */
-public interface AppVersionMapper extends BaseMapper<AppVersionDO> {
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+
+    @Select("SELECT * FROM li_app_version WHERE type=#{appType} ORDER BY version_update_date DESC LIMIT 1")
+    AppVersion getLatestVersion(String appType);
 
 }

framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java

@@ -1,15 +1,20 @@
 package cn.lili.modules.system.service;
 
-import cn.lili.modules.system.entity.dos.AppVersionDO;
+import cn.lili.modules.system.entity.dos.AppVersion;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 物流公司业务层
+ * app版本业务层
  *
  * @author Chopper
  * @date 2020/11/17 8:02 下午
  */
-public interface AppVersionService extends IService<AppVersionDO> {
-
+public interface AppVersionService extends IService<AppVersion> {
 
+    /**
+     * 获取当前最新的APP版本
+     * 获取用户的APP类型，返回最新的数据的版本号
+     * @return 最新的APP版本号
+     */
+    AppVersion getAppVersion(String appType);
 }

framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.system.serviceimpl;
 
-import cn.lili.modules.system.entity.dos.AppVersionDO;
+import cn.lili.modules.system.entity.dos.AppVersion;
 import cn.lili.modules.system.mapper.AppVersionMapper;
 import cn.lili.modules.system.service.AppVersionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,6 +16,10 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 @Transactional
-public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersionDO> implements AppVersionService {
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements AppVersionService {
 
+    @Override
+    public AppVersion getAppVersion(String appType) {
+        return this.baseMapper.getLatestVersion(appType);
+    }
 }

manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java

@@ -7,7 +7,7 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.entity.dos.AppVersionDO;
+import cn.lili.modules.system.entity.dos.AppVersion;
 import cn.lili.modules.system.service.AppVersionService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,33 +34,33 @@ public class AppVersionManagerController {
     private AppVersionService appVersionService;
 
 
-    @ApiOperation(value = "查询app升级消息", response = AppVersionDO.class)
+    @ApiOperation(value = "查询app升级消息", response = AppVersion.class)
     @GetMapping
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type", value = "APP类型", required = true, dataType = "type", paramType = "query")
     })
-    public ResultMessage<IPage<AppVersionDO>> getByPage(PageVO page, String type) {
+    public ResultMessage<IPage<AppVersion>> getByPage(PageVO page, String type) {
         return ResultUtil.data(this.appVersionService.page(PageUtil.initPage(page),
-                new QueryWrapper<AppVersionDO>().eq(StringUtils.isNotEmpty(type), "type", type).orderByDesc("create_time")));
+                new QueryWrapper<AppVersion>().eq(StringUtils.isNotEmpty(type), "type", type).orderByDesc("create_time")));
     }
 
 
-    @ApiOperation(value = "添加app版本信息", response = AppVersionDO.class)
+    @ApiOperation(value = "添加app版本信息", response = AppVersion.class)
     @PostMapping
-    public ResultMessage<Object> add(@Valid AppVersionDO appVersionDO) {
-        if(this.appVersionService.save(appVersionDO)){
+    public ResultMessage<Object> add(@Valid AppVersion appVersion) {
+        if(this.appVersionService.save(appVersion)){
             return ResultUtil.success();
         }
         throw new ServiceException(ResultCode.ERROR);
     }
 
     @PutMapping(value = "/{id}")
-    @ApiOperation(value = "修改app版本信息", response = AppVersionDO.class)
+    @ApiOperation(value = "修改app版本信息", response = AppVersion.class)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String", paramType = "path")
     })
-    public ResultMessage<Boolean> edit(@Valid AppVersionDO appVersionDO, @PathVariable String id) {
-        if(this.appVersionService.updateById(appVersionDO)){
+    public ResultMessage<Boolean> edit(@Valid AppVersion appVersion, @PathVariable String id) {
+        if(this.appVersionService.updateById(appVersion)){
             return ResultUtil.success();
         }
         throw new ServiceException(ResultCode.ERROR);

manager-api/src/main/resources/application.yml

@@ -135,22 +135,6 @@ ignored:
     - /MP_verify_qSyvBPhDsPdxvOhC.txt
     - /weixin/**
     - /source/**
-    - /buyer/mini-program/**
-    - /buyer/cashier/**
-    - /buyer/pageData/**
-    - /buyer/article/**
-    - /buyer/goods/**
-    - /buyer/category/**
-    - /buyer/shop/**
-    - /buyer/connect/**
-    - /buyer/members/smsLogin
-    - /buyer/members/refresh/*
-    - /buyer/members/refresh**
-    - /buyer/promotion/pintuan
-    - /buyer/promotion/seckill
-    - /buyer/memberEvaluation/**/goodsEvaluation
-    - /buyer/memberEvaluation/**/evaluationNumber
-    - /store/login/**
     - /manager/user/login
     - /manager/user/refresh/**
     - /manager/elasticsearch

seller-api/src/main/resources/application.yml

@@ -135,24 +135,7 @@ ignored:
     - /MP_verify_qSyvBPhDsPdxvOhC.txt
     - /weixin/**
     - /source/**
-    - /buyer/mini-program/**
-    - /buyer/cashier/**
-    - /buyer/pageData/**
-    - /buyer/article/**
-    - /buyer/goods/**
-    - /buyer/category/**
-    - /buyer/shop/**
-    - /buyer/connect/**
-    - /buyer/members/smsLogin
-    - /buyer/members/refresh/*
-    - /buyer/members/refresh**
-    - /buyer/promotion/pintuan
-    - /buyer/promotion/seckill
-    - /buyer/memberEvaluation/**/goodsEvaluation
-    - /buyer/memberEvaluation/**/evaluationNumber
     - /store/login/**
-    - /manager/user/login
-    - /manager/user/refresh/**
     - /druid/**
     - /swagger-ui.html
     - /doc.html