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

更新Note

Browse Source 
1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]
This commit is contained in:
stivepeim
2020-11-05 16:21:06 +08:00
parent 912cf6403e
commit 6827148d7a
574 changed files with 45105 additions and 4899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
crmeb/src/main/java/com/constants/SmsConstants.java
View File

@@ -1,38 +1,57 @@
package com.constants;
/**
* @author Mr.zhang
* @Description 短信配置
* @since 2020-04-17
**/
* 短信配置常量类
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2020 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
public class SmsConstants {
//------------------------------------------------短信配置------------------------------------------------
//短信请求地址
public static final String SMS_API_URL = "https://sms.crmeb.net/api/";
// public static final String SMS_API_URL = "https://sms.crmeb.net/api/";
public static final String SMS_API_URL = "http://plat.crmeb.net/api/";
//短信支付回调地址
public static final String SMS_API_PAY_NOTIFY_URI = "/api/sms/pay/notify";
//验证码接口
public static final String SMS_API_CAPTCHA_URI = "sms/captcha";
// public static final String SMS_API_CAPTCHA_URI = "sms/captcha";
public static final String SMS_API_CAPTCHA_URI = "user/code";
//账号注册地址
public static final String SMS_API_REGISTER_URI = "sms/register";
// public static final String SMS_API_REGISTER_URI = "sms/register";
public static final String SMS_API_REGISTER_URI = "user/register";
//公共短信模板列表
public static final String SMS_API_PUBLIC_TEMP_URI = "sms/publictemp";
//公共短信模板添加
public static final String SMS_API_PUBLIC_TEMP_USE_URI = "sms/use";
//获取账号信息
public static final String SMS_API_USER_INFO_URI = "sms/userinfo";
// public static final String SMS_API_USER_INFO_URI = "sms/userinfo";
public static final String SMS_API_USER_INFO_URI = "sms_v2/info";
//支付套餐
public static final String SMS_API_PAY_TEMP_LIST_URI = "sms/meal";
// public static final String SMS_API_PAY_TEMP_LIST_URI = "sms/meal";
public static final String SMS_API_PAY_TEMP_LIST_URI = "meal/list";
//支付二维码
public static final String SMS_API_PAY_QR_CODE_URI = "sms/mealpay";
//支付二维码
public static final String SMS_API_APPLY_TEMP_MESSAGE_URI = "sms/apply";
// public static final String SMS_API_APPLY_TEMP_MESSAGE_URI = "sms/apply";
public static final String SMS_API_APPLY_TEMP_MESSAGE_URI = "sms_v2/apply";
//短信模板列表
public static final String SMS_API_TEMP_LIST_URI = "sms/template";
// public static final String SMS_API_TEMP_LIST_URI = "sms/template";
public static final String SMS_API_TEMP_LIST_URI = "sms_v2/temps";
// 发送短信
public static final String SMS_API_SEND_URI = "sms/send";
// public static final String SMS_API_SEND_URI = "sms/send";
public static final String SMS_API_SEND_URI = "sms_v2/send";
// 获取发送状态
public static final String SMS_API_SEND_STATUS = "sms/status";
// 用户登录地址
public static final String SMS_API_USER_LOGIN = "user/login";
// 短信用户开通服务
public static final String SMS_API_USER_OPEN = "sms_v2/open";
//接口异常错误码
public static final Integer SMS_ERROR_CODE = 400;
@@ -50,7 +69,8 @@ public class SmsConstants {
public static final Integer SMS_CONFIG_LOWER_ORDER_SWITCH_TEMP_ID = 520268;// 对应的模版id
public static final String SMS_CONFIG_DELIVER_GOODS_SWITCH = "deliverGoodsSwitch";// 发货短信提醒
public static final Integer SMS_CONFIG_DELIVER_GOODS_SWITCH_TEMP_ID = 520269;
// public static final Integer SMS_CONFIG_DELIVER_GOODS_SWITCH_TEMP_ID = 520269;
public static final Integer SMS_CONFIG_DELIVER_GOODS_SWITCH_TEMP_ID = 441596;
public static final String SMS_CONFIG_CONFIRM_TAKE_OVER_SWITCH = "confirmTakeOverSwitch";// 确认收货短信提醒
public static final Integer SMS_CONFIG_CONFIRM_TAKE_OVER_SWITCH_TEMP_ID = 520271;
@@ -68,7 +88,8 @@ public class SmsConstants {
public static final Integer SMS_CONFIG_ADMIN_CONFIRM_TAKE_OVER_SWITCH_TEMP_ID = 520274;
public static final String SMS_CONFIG_PRICE_REVISION_SWITCH = "priceRevisionSwitch";// 改价短信提醒
public static final Integer SMS_CONFIG_PRICE_REVISION_SWITCH_TEMP_ID = 528288;
// public static final Integer SMS_CONFIG_PRICE_REVISION_SWITCH_TEMP_ID = 528288;
public static final Integer SMS_CONFIG_PRICE_REVISION_SWITCH_TEMP_ID = 440410;
public static final String SMS_CONFIG_ORDER_PAY_FALSE = "orderPayFalse";// 订单未支付
public static final Integer SMS_CONFIG_ORDER_PAY_FALSE_TEMP_ID = 528116;
@@ -92,4 +113,11 @@ public class SmsConstants {
public static final int SMS_CONFIG_TYPE_ADMIN_CONFIRM_TAKE_OVER_SWITCH = 8;// 用户发起退款管理员短信提醒
public static final int SMS_CONFIG_TYPE_PRICE_REVISION_SWITCH = 9;// 改价短信提醒
public static final int SMS_CONFIG_TYPE_ORDER_PAY_FALSE = 10;// 订单未支付
// 用户token的redis前缀 拼接secret
public static final String SMS_USER_TOKEN_REDIS_PREFIX = "sms_user_token_{}";
// 发送短信参数模板
public static final String SMS_COMMON_PARAM_FORMAT = "param[{}]";
// 用户token前缀
public static final String SMS_USER_TOKEN_PREFIX = "Bearer-";
}