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

修复内容

Browse Source 
1. 会员等级背景图去掉校验
	2. 当查询不到会员等级是，按无会员等级展示
	3. 删除商城首页冗余配置在index中的引用
	4. 换绑推广人时，计算上一个推广人的推广人数
	5. pc后台清除推广人时，更新推广人数量
	6. 保证砍价金额最小为0.01
	7. 修复商品删除时购物车关联删除
	8. 删除商品问题修复
	9. 运费模板——指定包邮，包邮数量类型修改
	10. 签到错误修复
	11. 修复我的优惠券只查询20条的问题
	12. 文章列表修复
	13. 拼团商品详情页数据统计显示问题修复
	14. PC后台，账户详情，持有优惠券列表修复
	15. 支付查询参数修复
	16. 修复过期优惠券可以重复领取
	17. 订单邮费切换地址重复计算修复
	18. 判断是否在指定包邮区域内 必须满足件数 + 金额 才能包邮
	19. 支付页面，切换tab，金额计算问题修复
	20. 物流模板新增、编辑——修复
	21. 去除线下邮费的影响
	22. 订单运费计算重写
	23. 下单页面到店自提合计金额不应该计算商品邮费
	24. 新人券领取后，部分使用时间为空——修复
This commit is contained in:
stivepeim
2021-03-19 18:26:43 +08:00
parent e289857849
commit f44c0ade12
292 changed files with 5985 additions and 41476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17241
crmeb/sql/crmeb_java_v1.3.1.sql
View File

File diff suppressed because one or more lines are too long

22
crmeb/sql/crmeb_java_v1.3.1_part.sql
View File

@@ -1,22 +0,0 @@
/**
增量更新sql
适用于1.3版本升级1.3.1
运行此脚本必须保证已经导入了1.3 的sql脚本
*/
-- 修改用户积分字段类型
alter table eb_user modify column integral int(11) NULL DEFAULT 0 COMMENT '用户剩余积分';
-- 修改订单表积分字段类型
alter table eb_store_order modify column gain_integral int(11) NULL DEFAULT 0 COMMENT '消费赚取积分';
alter table eb_store_order modify column use_integral int(11) NULL DEFAULT 0 COMMENT '使用积分';
alter table eb_store_order modify column back_integral int(11) NULL DEFAULT 0 COMMENT '给用户退了多少积分';
-- 修改商品表积分字段类型
alter table eb_store_product modify column give_integral int(11) NULL DEFAULT 0 COMMENT '获得积分';
-- 修改砍价商品积分字段类型
alter table eb_store_bargain modify column give_integral int(11) NULL DEFAULT 0 COMMENT '反多少积分';
-- 修改秒杀商品积分字段类型
alter table eb_store_seckill modify column give_integral int(11) NULL DEFAULT 0 COMMENT '反多少积分';
-- 评价表添加sku字段
alter table eb_store_product_reply add sku varchar(128) NOT NULL DEFAULT '' COMMENT '商品规格属性值,多个,号隔开';

41
crmeb/sql/crmeb_java_v1.3.2_part.sql
View File

@@ -1,41 +0,0 @@
/**
增量更新sql
适用于1.3.1版本升级1.3.2
运行此脚本必须保证已经导入了1.3.1 的sql脚本
*/
alter table eb_system_admin add phone varchar(15) DEFAULT NULL COMMENT '手机号码';
alter table eb_system_admin add is_sms tinyint(1) unsigned DEFAULT '0' COMMENT '是否接收短信';
select * from `eb_system_attachment` s where s.`satt_dir` like 'image/%';
update `eb_system_attachment` s set s.`satt_dir` = REPLACE(`satt_dir`,'image/','crmebimage/') where s.`satt_dir` like 'image/%';
select * from `eb_system_config` s where s.`value` like 'image/%';
update `eb_system_config` c set c.`value` = REPLACE(`value`,'image/','crmebimage/') where c.`value` like 'image/%';
select * from `eb_system_group_data` d where d.`value` like '%image/%';
update `eb_system_group_data` d set d.`value` = REPLACE(`value`, 'image/', 'crmebimage/')where d.`value` like '%image/%';
select * from `eb_store_product` p where p.`image` like'image/%';
update `eb_store_product` p set p.`image` = REPLACE(`image`,'image/','crmebimage/') where p.`image` like 'image/%';
select * from `eb_store_product` p where p.`slider_image` like'%image/%';
update `eb_store_product` p set p.`slider_image` = REPLACE(`slider_image`,'image/','crmebimage/') where p.`image` like '%image/%';
select * from `eb_store_order_info` i where i.`info` like '%image/%';
update `eb_store_order_info` p set p.`info` = REPLACE(`info`,'image/','crmebimage/') where p.`info` like '%image/%';
select * from `eb_system_user_level` s where s.`image` like '%image/%' or s.`icon` like '%image/%';
update `eb_system_user_level` s set s.`image` = REPLACE(`image`,'image/','crmebimage/') where s.`image` like '%image/%';
update `eb_system_user_level` s set s.`icon` = REPLACE(`icon`,'image/','crmebimage/') where s.`icon` like '%image/%';
select * from `eb_user` u where u.`avatar` like 'image/%';
update `eb_user` u set u.`avatar` = REPLACE(`avatar`,'image/','crmebimage/') where u.`avatar` like 'image/%';

13041
crmeb/sql/crmeb_java_v1.3.sql
View File

File diff suppressed because one or more lines are too long

58
crmeb/sql/重置admin.sql Normal file
View File

@@ -0,0 +1,58 @@
# ************************************************************
# 重置admin
# ************************************************************
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
# Dump of table eb_system_admin
# ------------------------------------------------------------
DROP TABLE IF EXISTS `eb_system_admin`;
CREATE TABLE `eb_system_admin` (
`id` smallint(5) unsigned NOT NULL AUTO_INCREMENT COMMENT '后台管理员表ID',
`account` varchar(32) NOT NULL COMMENT '后台管理员账号',
`pwd` char(32) NOT NULL COMMENT '后台管理员密码',
`real_name` varchar(16) NOT NULL COMMENT '后台管理员姓名',
`roles` varchar(128) NOT NULL COMMENT '后台管理员权限(menus_id)',
`last_ip` varchar(16) DEFAULT NULL COMMENT '后台管理员最后一次登录ip',
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '后台管理员最后一次登录时间',
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '后台管理员添加时间',
`login_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '登录次数',
`level` tinyint(3) unsigned NOT NULL DEFAULT '1' COMMENT '后台管理员级别',
`status` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '后台管理员状态 1有效0无效',
`is_del` tinyint(1) unsigned NOT NULL DEFAULT '0',
`phone` varchar(15) DEFAULT NULL COMMENT '手机号码',
`is_sms` tinyint(1) unsigned DEFAULT '0' COMMENT '是否接收短信',
PRIMARY KEY (`id`) USING BTREE,
KEY `account` (`account`) USING BTREE,
KEY `status` (`status`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='后台管理员表';
LOCK TABLES `eb_system_admin` WRITE;
/*!40000 ALTER TABLE `eb_system_admin` DISABLE KEYS */;
INSERT INTO `eb_system_admin` (`id`, `account`, `pwd`, `real_name`, `roles`, `last_ip`, `update_time`, `create_time`, `login_count`, `level`, `status`, `is_del`, `phone`, `is_sms`)
VALUES
(1,'admin','L8qdg72wbeQ=','admin','1','111.19.94.179','2021-03-09 22:39:20','2020-08-17 17:48:58',1317,0,1,0,'18292417675',0),
(36,'demo','Rb/KmlSjAxI=','普通','3','60.210.126.252','2021-02-04 11:23:03','2021-02-04 11:23:03',2,1,1,0,NULL,0);
/*!40000 ALTER TABLE `eb_system_admin` ENABLE KEYS */;
UNLOCK TABLES;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;