jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1:运行Java程序后访问localhost:8080 自动跳转doc.html

Browse Source 
2:修复默认运费配置数据，确定订单下单正确
3:小程序超包问题
This commit is contained in:
stivepeim
2021-04-26 18:40:42 +08:00
parent 0afcddc205
commit d3554b6de0
49 changed files with 8760 additions and 19381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19354
crmeb/sql/crmeb_java_v1.3.2.sql
View File

File diff suppressed because one or more lines are too long

8736
crmeb/sql/crmeb_java_v1.3.3.sql Normal file
View File

File diff suppressed because one or more lines are too long

2
crmeb/src/main/java/com/utils/ArrayUtil.java
View File

@@ -1,7 +1,5 @@
package com.utils;
import org.apache.poi.ss.formula.functions.T;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;

1
crmeb/src/main/java/com/utils/CrmebUtil.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSONObject;
import com.constants.Constants;
import com.exception.CrmebException;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import javax.crypto.Cipher;

1
crmeb/src/main/java/com/zbkj/crmeb/category/controller/CategoryController.java
View File

@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

3
crmeb/src/main/java/com/zbkj/crmeb/seckill/controller/StoreSeckillController.java
View File

@@ -3,8 +3,6 @@ package com.zbkj.crmeb.seckill.controller;
import com.common.CommonPage;
import com.common.CommonResult;
import com.common.PageParamRequest;
import com.exception.CrmebException;
import com.zbkj.crmeb.seckill.model.StoreSeckill;
import com.zbkj.crmeb.seckill.request.StoreSeckillRequest;
import com.zbkj.crmeb.seckill.request.StoreSeckillSearchRequest;
import com.zbkj.crmeb.seckill.response.StoreSeckillResponse;
@@ -13,7 +11,6 @@ import com.zbkj.crmeb.store.response.StoreProductResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

7
crmeb/src/main/java/com/zbkj/crmeb/seckill/controller/StoreSeckillMangerController.java
View File

@@ -10,15 +10,14 @@ import com.zbkj.crmeb.seckill.request.StoreSeckillMangerSearchRequest;
import com.zbkj.crmeb.seckill.response.StoreSeckillManagerResponse;
import com.zbkj.crmeb.seckill.service.StoreSeckillMangerService;
import com.zbkj.crmeb.system.service.SystemAttachmentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;

2
crmeb/src/main/java/com/zbkj/crmeb/sms/controller/SmsRecordController.java
View File

@@ -4,13 +4,11 @@ import com.alibaba.fastjson.JSONObject;
import com.common.CommonResult;
import com.common.MyRecord;
import com.common.PageParamRequest;
import com.utils.ValidateFormUtil;
import com.zbkj.crmeb.sms.request.SmsApplyTempRequest;
import com.zbkj.crmeb.sms.request.SmsModifySignRequest;
import com.zbkj.crmeb.sms.service.SmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreOrderController.java
View File

@@ -2,7 +2,6 @@ package com.zbkj.crmeb.store.controller;
import com.common.CommonResult;
import com.common.PageParamRequest;
import com.exception.CrmebException;
import com.zbkj.crmeb.express.vo.ExpressSheetVo;
import com.zbkj.crmeb.express.vo.LogisticsResultVo;
import com.zbkj.crmeb.store.model.StoreOrder;
@@ -24,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
/**

7
crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductReplyController.java
View File

@@ -13,13 +13,12 @@ import com.zbkj.crmeb.store.request.StoreProductReplyRequest;
import com.zbkj.crmeb.store.request.StoreProductReplySearchRequest;
import com.zbkj.crmeb.store.response.StoreProductReplyResponse;
import com.zbkj.crmeb.store.service.StoreProductReplyService;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;

13
crmeb/src/main/java/com/zbkj/crmeb/system/controller/RedirectController.java Normal file
View File

@@ -0,0 +1,13 @@
package com.zbkj.crmeb.system.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class RedirectController {
@RequestMapping("/")
public String What(){
return "redirect:/doc.html";
}
}

10
crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemGroupDataController.java
View File

@@ -3,18 +3,16 @@ package com.zbkj.crmeb.system.controller;
import com.common.CommonPage;
import com.common.CommonResult;
import com.common.PageParamRequest;
import com.zbkj.crmeb.system.request.SystemFormCheckRequest;
import com.zbkj.crmeb.system.model.SystemGroupData;
import com.zbkj.crmeb.system.request.SystemGroupDataRequest;
import com.zbkj.crmeb.system.request.SystemGroupDataSearchRequest;
import com.zbkj.crmeb.system.service.SystemGroupDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import com.zbkj.crmeb.system.service.SystemGroupDataService;
import com.zbkj.crmeb.system.model.SystemGroupData;
/**

3
crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemAdminDao.java
View File

@@ -1,8 +1,7 @@
package com.zbkj.crmeb.system.dao;
import com.zbkj.crmeb.system.model.SystemAdmin;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zbkj.crmeb.system.response.SystemAdminResponse;
import com.zbkj.crmeb.system.model.SystemAdmin;
/**
* 后台管理员表 Mapper 接口