Skip to content

O
oms
提交 42527d26 作者: 张小凤
操作

PackageName(update)

上级 4301216a
正在显示 包含 472 行增加 和 414 行删除
src/main/java/com/mmc/oms/common/AuthHandler.java
package com.mmc.oms.common; package com.mmc.oms.common;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.mmc.oms.common.json.JsonUtil;
import com.mmc.oms.jwt.JwtConstant; import com.mmc.oms.jwt.JwtConstant;
import com.mmc.oms.model.dto.user.BaseAccountDTO;
import com.mmc.oms.model.dto.BaseAccountDTO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
...@@ -73,7 +75,7 @@ public class AuthHandler { ...@@ -73,7 +75,7 @@ public class AuthHandler {
String key = RedisConstant.getCompanyChildKey(companyId); String key = RedisConstant.getCompanyChildKey(companyId);
if (stringRedisTemplate.hasKey(key)) { if (stringRedisTemplate.hasKey(key)) {
String json = stringRedisTemplate.opsForValue().get(key); String json = stringRedisTemplate.opsForValue().get(key);
if(!StringUtils.isEmpty(json)) { if (!StringUtils.isEmpty(json)) {
List<Integer> list = JSONArray.parseArray(json, Integer.class); List<Integer> list = JSONArray.parseArray(json, Integer.class);
return list; return list;
} }
......
src/main/java/com/mmc/oms/common/CouponConstants.java deleted 100644 → 0
package com.mmc.oms.common;
/**
* @Author small
* @Date 2023/5/24 14:03
* @Version 1.0
*/
public class CouponConstants {
/**
* --------优惠券常量------------
*/
/** 优惠券类型—打折券 */
public static final Integer COUPON_TYPE_DISCOUNT = 1;
/** 优惠券类型—减免券 */
public static final Integer COUPON_TYPE_REDUCED = 2;
/** 优惠券类型—无门槛 */
public static final Integer COUPON_TYPE_NO_THRESHOLD = 3;
/** 优惠券使用类型—vip */
public static final Integer COUPON_USR_TYPE_VIP = 1;
/** 优惠券使用类型—品牌券 */
public static final Integer COUPON_USR_TYPE_BRAND = 2;
/** 优惠券有效期时间方式-固定时间 */
public static final Integer COUPON_USE_TIME_FIXED = 0;
/** 优惠券有效期时间方式-领取当日起 */
public static final Integer COUPON_USE_TIME_THE_DAY = 1;
/** 优惠券有效期时间方式-领取次日起 */
public static final Integer COUPON_USE_TIME_NEXT_DAY = 2;
/** 优惠券发放方式—手动领取 */
public static final Integer COUPON_ISSUE_TYPE_RECEIVE = 1;
/** 优惠券发放方式—系统发放 */
public static final Integer COUPON_ISSUE_TYPE_INITIATIVE =2;
/** 优惠券发放方式—批量导入用户 */
public static final Integer COUPON_ISSUE_TYPE_IMPORT = 3;
/** 优惠券使用类型—活动裂变券 */
public static final Integer COUPON_USR_TYPE_ACTIVITY = 4;
/** 用户标签-新人 */
public static final Integer USER_LABEL_NEW_PEOPLE = 1;
/** 用户标签-实名认证 */
public static final Integer USER_LABEL_REAL_NAME_AUTHENTICATION = 2;
/** 用户标签-企业认证 */
public static final Integer USER_LABEL_ENTERPRISE_CERTIFICATION = 3;
/**
* --------用户优惠券常量----------------
*/
/** 用户优惠券获取方式—用户领取 */
public static final String STORE_COUPON_USER_TYPE_GET = "receive";
/** 用户优惠券获取方式—后台发放 */
public static final String STORE_COUPON_USER_TYPE_SEND = "send";
/** 用户优惠券获取方式—赠送 */
public static final String STORE_COUPON_USER_TYPE_PRESENTED = "presented";
/** 用户优惠券获取方式—获赠 */
public static final String STORE_COUPON_USER_TYPE_ACQUIRE = "acquire";
/** 用户优惠券获取方式—兑换 */
public static final String STORE_COUPON_USER_TYPE_EXCHANGE = "exchange";
/** 用户优惠券获取方式—活动领取 */
public static final String STORE_COUPON_USER_TYPE_ACTIVITY = "activity";
/** 用户优惠券状态—未使用 */
public static final Integer STORE_COUPON_USER_STATUS_USABLE = 0;
/** 用户优惠券状态—已使用 */
public static final Integer STORE_COUPON_USER_STATUS_USED = 1;
/** 用户优惠券状态—已失效 */
public static final Integer STORE_COUPON_USER_STATUS_LAPSED = 2;
/** 用户优惠券状态—已转赠 */
public static final Integer STORE_COUPON_USER_STATUS_PRESENTED = 3;
/** 用户优惠券状态—使用中 */
public static final Integer STORE_COUPON_USER_STATUS_IN_USE = 4;
}
src/main/java/com/mmc/oms/common/ResultEnum.java
...@@ -401,7 +401,8 @@ public enum ResultEnum implements BaseErrorInfoInterface { ...@@ -401,7 +401,8 @@ public enum ResultEnum implements BaseErrorInfoInterface {
REFUND_FAILED("2015", "退款失败，请联系客服"), REFUND_FAILED("2015", "退款失败，请联系客服"),
NO_PERMISSION_TEMPORARILY("2016", "当前账号没有权限，只有后台账号拥有权限"), NO_PERMISSION_TEMPORARILY("2016", "当前账号没有权限，只有后台账号拥有权限"),
THERE_IS_NO_SUCH_ORDER("2017", "没有当前订单,请输入正确的订单编号"), THERE_IS_NO_SUCH_ORDER("2017", "没有当前订单,请输入正确的订单编号"),
THE_TOKEN_CANNOT_BE_NULL("2018", "token不能为null"); THE_TOKEN_CANNOT_BE_NULL("2018", "token不能为null"),
THE_CURRENT_ACCOUNT_CANNOT_PLACE_ORDERS("2019", "后台管理账号不能下单");
/** /**
* 错误码 * 错误码
......
src/main/java/com/mmc/oms/common/coupon/CouponConstants.java 0 → 100644
package com.mmc.oms.common.coupon;
/**
* @Author small
* @Date 2023/5/24 14:03
* @Version 1.0
*/
public class CouponConstants {
/**
* --------优惠券常量------------
*/
/**
* 优惠券类型—打折券
*/
public static final Integer COUPON_TYPE_DISCOUNT = 1;
/**
* 优惠券类型—减免券
*/
public static final Integer COUPON_TYPE_REDUCED = 2;
/**
* 优惠券类型—无门槛
*/
public static final Integer COUPON_TYPE_NO_THRESHOLD = 3;
/**
* 优惠券使用类型—vip
*/
public static final Integer COUPON_USR_TYPE_VIP = 1;
/**
* 优惠券使用类型—品牌券
*/
public static final Integer COUPON_USR_TYPE_BRAND = 2;
/**
* 优惠券有效期时间方式-固定时间
*/
public static final Integer COUPON_USE_TIME_FIXED = 0;
/**
* 优惠券有效期时间方式-领取当日起
*/
public static final Integer COUPON_USE_TIME_THE_DAY = 1;
/**
* 优惠券有效期时间方式-领取次日起
*/
public static final Integer COUPON_USE_TIME_NEXT_DAY = 2;
/**
* 优惠券发放方式—手动领取
*/
public static final Integer COUPON_ISSUE_TYPE_RECEIVE = 1;
/**
* 优惠券发放方式—系统发放
*/
public static final Integer COUPON_ISSUE_TYPE_INITIATIVE = 2;
/**
* 优惠券发放方式—批量导入用户
*/
public static final Integer COUPON_ISSUE_TYPE_IMPORT = 3;
/**
* 优惠券使用类型—活动裂变券
*/
public static final Integer COUPON_USR_TYPE_ACTIVITY = 4;
/**
* 用户标签-新人
*/
public static final Integer USER_LABEL_NEW_PEOPLE = 1;
/**
* 用户标签-实名认证
*/
public static final Integer USER_LABEL_REAL_NAME_AUTHENTICATION = 2;
/**
* 用户标签-企业认证
*/
public static final Integer USER_LABEL_ENTERPRISE_CERTIFICATION = 3;
/**
* --------用户优惠券常量----------------
*/
/**
* 用户优惠券获取方式—用户领取
*/
public static final String STORE_COUPON_USER_TYPE_GET = "receive";
/**
* 用户优惠券获取方式—后台发放
*/
public static final String STORE_COUPON_USER_TYPE_SEND = "send";
/**
* 用户优惠券获取方式—赠送
*/
public static final String STORE_COUPON_USER_TYPE_PRESENTED = "presented";
/**
* 用户优惠券获取方式—获赠
*/
public static final String STORE_COUPON_USER_TYPE_ACQUIRE = "acquire";
/**
* 用户优惠券获取方式—兑换
*/
public static final String STORE_COUPON_USER_TYPE_EXCHANGE = "exchange";
/**
* 用户优惠券获取方式—活动领取
*/
public static final String STORE_COUPON_USER_TYPE_ACTIVITY = "activity";
/**
* 用户优惠券状态—未使用
*/
public static final Integer STORE_COUPON_USER_STATUS_USABLE = 0;
/**
* 用户优惠券状态—已使用
*/
public static final Integer STORE_COUPON_USER_STATUS_USED = 1;
/**
* 用户优惠券状态—已失效
*/
public static final Integer STORE_COUPON_USER_STATUS_LAPSED = 2;
/**
* 用户优惠券状态—已转赠
*/
public static final Integer STORE_COUPON_USER_STATUS_PRESENTED = 3;
/**
* 用户优惠券状态—使用中
*/
public static final Integer STORE_COUPON_USER_STATUS_IN_USE = 4;
}
src/main/java/com/mmc/oms/common/CouponType.java → src/main/java/com/mmc/oms/common/coupon/CouponType.java
package com.mmc.oms.common; package com.mmc.oms.common.coupon;
/** /**
* @Author small * @Author small
...@@ -7,9 +7,9 @@ package com.mmc.oms.common; ...@@ -7,9 +7,9 @@ package com.mmc.oms.common;
*/ */
public interface CouponType { public interface CouponType {
//打折券 //打折券
public static final Integer DISCOUNT_COUPONS=1; public static final Integer DISCOUNT_COUPONS = 1;
//减免卷 //减免卷
public static final Integer REDUCTION_ROLLS=2; public static final Integer REDUCTION_ROLLS = 2;
//无门槛 //无门槛
public static final Integer NO_THRESHOLD=3; public static final Integer NO_THRESHOLD = 3;
} }
src/main/java/com/mmc/oms/common/CouponUserExcel.java → src/main/java/com/mmc/oms/common/coupon/CouponUserExcel.java
package com.mmc.oms.common; package com.mmc.oms.common.coupon;
import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.excel.annotation.ExcelTarget; import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -23,7 +22,7 @@ import java.util.Date; ...@@ -23,7 +22,7 @@ import java.util.Date;
@ExcelTarget("couponUserExcel") @ExcelTarget("couponUserExcel")
public class CouponUserExcel implements Serializable { public class CouponUserExcel implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
@Excel(name = "优惠券id", orderNum = "1", width = 25) @Excel(name = "优惠券id", orderNum = "1", width = 25)
private Integer couponId; private Integer couponId;
......
src/main/java/com/mmc/oms/common/JsonUtil.java → src/main/java/com/mmc/oms/common/json/JsonUtil.java
package com.mmc.oms.common; package com.mmc.oms.common.json;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
......
src/main/java/com/mmc/oms/common/Auto.java → src/main/java/com/mmc/oms/common/publicinterface/Auto.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Confirm.java → src/main/java/com/mmc/oms/common/publicinterface/Confirm.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Create.java → src/main/java/com/mmc/oms/common/publicinterface/Create.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Freeze.java → src/main/java/com/mmc/oms/common/publicinterface/Freeze.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Insert.java → src/main/java/com/mmc/oms/common/publicinterface/Insert.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Others.java → src/main/java/com/mmc/oms/common/publicinterface/Others.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Page.java → src/main/java/com/mmc/oms/common/publicinterface/Page.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Publicsher.java → src/main/java/com/mmc/oms/common/publicinterface/Publicsher.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
import com.mmc.oms.model.dto.OrderInfoDTO; import com.mmc.oms.model.dto.order.OrderInfoDTO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Query.java → src/main/java/com/mmc/oms/common/publicinterface/Query.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Refund.java → src/main/java/com/mmc/oms/common/publicinterface/Refund.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/RepeatSubmit.java → src/main/java/com/mmc/oms/common/publicinterface/RepeatSubmit.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
......
src/main/java/com/mmc/oms/common/Send.java → src/main/java/com/mmc/oms/common/publicinterface/Send.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Share.java → src/main/java/com/mmc/oms/common/publicinterface/Share.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Take.java → src/main/java/com/mmc/oms/common/publicinterface/Take.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/Update.java → src/main/java/com/mmc/oms/common/publicinterface/Update.java
package com.mmc.oms.common; package com.mmc.oms.common.publicinterface;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/PageResult.java → src/main/java/com/mmc/oms/common/result/PageResult.java
package com.mmc.oms.common; package com.mmc.oms.common.result;
import com.mmc.oms.model.qo.BaseInfoQO; import com.mmc.oms.model.qo.BaseInfoQO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/oms/common/ResultBody.java → src/main/java/com/mmc/oms/common/result/ResultBody.java
package com.mmc.oms.common; package com.mmc.oms.common.result;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModel; import com.mmc.oms.common.BaseErrorInfoInterface;
import com.mmc.oms.common.ResultEnum;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -71,9 +72,8 @@ public class ResultBody<T> implements Serializable { ...@@ -71,9 +72,8 @@ public class ResultBody<T> implements Serializable {
/** /**
* 成功 * 成功
* **/
* **/ public static ResultBody success1(ResultEnum enums) {
public static ResultBody success1(ResultEnum enums){
ResultBody rb = new ResultBody(); ResultBody rb = new ResultBody();
rb.setCode("200"); rb.setCode("200");
rb.setMessage(enums.getResultMsg()); rb.setMessage(enums.getResultMsg());
......
src/main/java/com/mmc/oms/common/ChannelAuthStatus.java → src/main/java/com/mmc/oms/common/status/ChannelAuthStatus.java
package com.mmc.oms.common; package com.mmc.oms.common.status;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/EntAuthStatus.java → src/main/java/com/mmc/oms/common/status/EntAuthStatus.java
package com.mmc.oms.common; package com.mmc.oms.common.status;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/RealAuthStatus.java → src/main/java/com/mmc/oms/common/status/RealAuthStatus.java
package com.mmc.oms.common; package com.mmc.oms.common.status;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/RefundStatus.java → src/main/java/com/mmc/oms/common/status/RefundStatus.java
package com.mmc.oms.common; package com.mmc.oms.common.status;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/TranStatusDic.java → src/main/java/com/mmc/oms/common/status/TranStatusDic.java
package com.mmc.oms.common; package com.mmc.oms.common.status;
/** /**
* @Author small * @Author small
...@@ -21,9 +21,7 @@ public enum TranStatusDic { ...@@ -21,9 +21,7 @@ public enum TranStatusDic {
TKSQ("700", "退款申请中", "待退款完成"), TKSQ("700", "退款申请中", "待退款完成"),
CLOSE("999", "订单关闭", "订单关闭") CLOSE("999", "订单关闭", "订单关闭");
;
private String status; private String status;
private String waiting; private String waiting;
......
src/main/java/com/mmc/oms/common/WarePayStatus.java → src/main/java/com/mmc/oms/common/status/WarePayStatus.java
package com.mmc.oms.common; package com.mmc.oms.common.status;
/** /**
* @Author small * @Author small
......
src/main/java/com/mmc/oms/common/CodeUtil.java → src/main/java/com/mmc/oms/common/util/CodeUtil.java
package com.mmc.oms.common; package com.mmc.oms.common.util;
import java.util.Random; import java.util.Random;
......
src/main/java/com/mmc/oms/common/KdnExpressUtil.java → src/main/java/com/mmc/oms/common/util/KdnExpressUtil.java
package com.mmc.oms.common; package com.mmc.oms.common.util;
import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
...@@ -25,7 +25,7 @@ public class KdnExpressUtil { ...@@ -25,7 +25,7 @@ public class KdnExpressUtil {
// 请求url, 正式环境地址 // 请求url, 正式环境地址
private static String ReqURL = "https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx"; private static String ReqURL = "https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx";
//订阅推送请求url, 正式环境地址 //订阅推送请求url, 正式环境地址
private static String KdApiSearchMonitorPushReqURL="https://api.kdniao.com/api/dist"; private static String KdApiSearchMonitorPushReqURL = "https://api.kdniao.com/api/dist";
public static void main(String[] args) { public static void main(String[] args) {
try { try {
...@@ -104,6 +104,7 @@ public class KdnExpressUtil { ...@@ -104,6 +104,7 @@ public class KdnExpressUtil {
/** /**
* 物流跟踪接口(增值版) * 物流跟踪接口(增值版)
*
* @param callbackTag-表示端口及订单：端口/订单号 * @param callbackTag-表示端口及订单：端口/订单号
* @param shipperCode-快递公司编码 * @param shipperCode-快递公司编码
* @param logisticCode-快递编号 * @param logisticCode-快递编号
...@@ -111,24 +112,24 @@ public class KdnExpressUtil { ...@@ -111,24 +112,24 @@ public class KdnExpressUtil {
* @return * @return
* @throws Exception * @throws Exception
*/ */
public static String kdApiSearchMonitorPush(String callbackTag, String shipperCode, String logisticCode, String customerName) throws Exception{ public static String kdApiSearchMonitorPush(String callbackTag, String shipperCode, String logisticCode, String customerName) throws Exception {
// 组装应用级参数 // 组装应用级参数
String RequestData= "{"+ String RequestData = "{" +
"'Callback':'"+callbackTag+"',"+ "'Callback':'" + callbackTag + "'," +
"'ShipperCode':'"+shipperCode+"',"+ "'ShipperCode':'" + shipperCode + "'," +
"'LogisticCode':'"+logisticCode+"',"+ "'LogisticCode':'" + logisticCode + "'," +
"'CustomerName':'"+customerName+"',"+ "'CustomerName':'" + customerName + "'," +
"}"; "}";
// 组装系统级参数 // 组装系统级参数
Map<String,String> params = new HashMap<String,String>(); Map<String, String> params = new HashMap<String, String>();
params.put("RequestData", urlEncoder(RequestData, "UTF-8")); params.put("RequestData", urlEncoder(RequestData, "UTF-8"));
params.put("EBusinessID", EBusinessID); params.put("EBusinessID", EBusinessID);
params.put("RequestType", "8005");//在途监控订阅接口指令8008/地图版订阅接口指令8005 params.put("RequestType", "8005");//在途监控订阅接口指令8008/地图版订阅接口指令8005
String dataSign=encrypt(RequestData, ApiKey, "UTF-8"); String dataSign = encrypt(RequestData, ApiKey, "UTF-8");
params.put("DataSign", urlEncoder(dataSign, "UTF-8")); params.put("DataSign", urlEncoder(dataSign, "UTF-8"));
params.put("DataType", "2"); params.put("DataType", "2");
// 以form表单形式提交post请求，post请求体中包含了应用级参数和系统级参数 // 以form表单形式提交post请求，post请求体中包含了应用级参数和系统级参数
String result=sendPost(KdApiSearchMonitorPushReqURL, params); String result = sendPost(KdApiSearchMonitorPushReqURL, params);
//根据公司业务处理返回的信息...... //根据公司业务处理返回的信息......
return result; return result;
...@@ -174,8 +175,8 @@ public class KdnExpressUtil { ...@@ -174,8 +175,8 @@ public class KdnExpressUtil {
/** /**
* 电商Sign签名生成 content 内容 keyValue ApiKey charset 编码方式 * 电商Sign签名生成 content 内容 keyValue ApiKey charset 编码方式
* *
* @throws UnsupportedEncodingException ,Exception
* @return DataSign签名 * @return DataSign签名
* @throws UnsupportedEncodingException ,Exception
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static String encrypt(String content, String keyValue, String charset) private static String encrypt(String content, String keyValue, String charset)
......
src/main/java/com/mmc/oms/common/TDateUtil.java → src/main/java/com/mmc/oms/common/util/TDateUtil.java
package com.mmc.oms.common; package com.mmc.oms.common.util;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -160,17 +160,18 @@ public class TDateUtil { ...@@ -160,17 +160,18 @@ public class TDateUtil {
/** /**
* 某天个时间加 N 小时 * 某天个时间加 N 小时
*
* @param now * @param now
* @param num * @param num
* @return * @return
*/ */
public static Date addHourTime(Date now,int num){ public static Date addHourTime(Date now, int num) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = null; Date date = null;
try { try {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(now); calendar.setTime(now);
calendar.add(Calendar.HOUR,num); calendar.add(Calendar.HOUR, num);
String last = format.format(calendar.getTime()); String last = format.format(calendar.getTime());
date = getDate(last, "yyyy-MM-dd HH:mm:ss"); date = getDate(last, "yyyy-MM-dd HH:mm:ss");
} catch (Exception e) { } catch (Exception e) {
...@@ -480,7 +481,7 @@ public class TDateUtil { ...@@ -480,7 +481,7 @@ public class TDateUtil {
*/ */
public static Date getLastYearTodayDate() { public static Date getLastYearTodayDate() {
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.add(Calendar.YEAR,-1); instance.add(Calendar.YEAR, -1);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String s = format.format(instance.getTime()); String s = format.format(instance.getTime());
return getDate(s, "yyyy-MM-dd"); return getDate(s, "yyyy-MM-dd");
...@@ -488,12 +489,13 @@ public class TDateUtil { ...@@ -488,12 +489,13 @@ public class TDateUtil {
/** /**
* 获取昨天的日期 * 获取昨天的日期
*
* @param type * @param type
* @return * @return
*/ */
public static String getYesterdayDateByType(String type){ public static String getYesterdayDateByType(String type) {
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.add(Calendar.DAY_OF_MONTH,-1); instance.add(Calendar.DAY_OF_MONTH, -1);
Date time = instance.getTime(); Date time = instance.getTime();
SimpleDateFormat format = new SimpleDateFormat(type); SimpleDateFormat format = new SimpleDateFormat(type);
return format.format(time); return format.format(time);
...@@ -517,24 +519,26 @@ public class TDateUtil { ...@@ -517,24 +519,26 @@ public class TDateUtil {
/** /**
* 间隔天数 * 间隔天数
*
* @param startTime * @param startTime
* @param endTime * @param endTime
* @return * @return
*/ */
public static int isolateDayNum(String startTime, String endTime){ public static int isolateDayNum(String startTime, String endTime) {
Date startDate = getDate(startTime, "yyyy-MM-dd"); Date startDate = getDate(startTime, "yyyy-MM-dd");
Date endDate = getDate(endTime, "yyyy-MM-dd"); Date endDate = getDate(endTime, "yyyy-MM-dd");
long differentMillis = endDate.getTime() - startDate.getTime(); long differentMillis = endDate.getTime() - startDate.getTime();
long dayNum = differentMillis/(1000*60*60*24); long dayNum = differentMillis / (1000 * 60 * 60 * 24);
return (int)dayNum; return (int) dayNum;
} }
/** /**
* 获取某月最后一天的时间 * 获取某月最后一天的时间
*
* @param yearMonth * @param yearMonth
* @return * @return
*/ */
public static String getLastDateTimeOfMonth(String yearMonth){ public static String getLastDateTimeOfMonth(String yearMonth) {
SimpleDateFormat format0 = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat format0 = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
...@@ -547,19 +551,19 @@ public class TDateUtil { ...@@ -547,19 +551,19 @@ public class TDateUtil {
instance.set(Calendar.SECOND, 59); instance.set(Calendar.SECOND, 59);
String format = format1.format(instance.getTime()); String format = format1.format(instance.getTime());
return format; return format;
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
return null; return null;
} }
public static Date getStrToDate(String str){ public static Date getStrToDate(String str) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = null; Date date = null;
try { try {
if (str==null){ if (str == null) {
date = null; date = null;
}else { } else {
date = dateFormat.parse(str); date = dateFormat.parse(str);
} }
} catch (ParseException e) { } catch (ParseException e) {
...@@ -568,7 +572,7 @@ public class TDateUtil { ...@@ -568,7 +572,7 @@ public class TDateUtil {
return date; return date;
} }
public static int getStageByDate(Date date){ public static int getStageByDate(Date date) {
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(date); instance.setTime(date);
//当前时间 //当前时间
...@@ -584,22 +588,22 @@ public class TDateUtil { ...@@ -584,22 +588,22 @@ public class TDateUtil {
Date parse4 = dateFormat.parse("00:00:00"); Date parse4 = dateFormat.parse("00:00:00");
//A:05:00-11:00 | B:11:00-17:00 | C:00:00-05:00,17:00-00:00 //A:05:00-11:00 | B:11:00-17:00 | C:00:00-05:00,17:00-00:00
if (currentTime.after(parse4) && currentTime.before(parse1) ) { if (currentTime.after(parse4) && currentTime.before(parse1)) {
return 3; return 3;
}else if (currentTime.after(parse1) && currentTime.before(parse2)) { } else if (currentTime.after(parse1) && currentTime.before(parse2)) {
return 1; return 1;
}else if(currentTime.after(parse2) && currentTime.before(parse3)){ } else if (currentTime.after(parse2) && currentTime.before(parse3)) {
return 2; return 2;
}else if(currentTime.after(parse3) && currentTime.after(parse4)){ } else if (currentTime.after(parse3) && currentTime.after(parse4)) {
return 4; return 4;
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
return 0; return 0;
} }
public static String getCurrentYear(){ public static String getCurrentYear() {
Calendar date = Calendar.getInstance(); Calendar date = Calendar.getInstance();
String year = String.valueOf(date.get(Calendar.YEAR)); String year = String.valueOf(date.get(Calendar.YEAR));
return year; return year;
......
src/main/java/com/mmc/oms/controller/BaseController.java
...@@ -5,8 +5,8 @@ import com.mmc.oms.common.AuthHandler; ...@@ -5,8 +5,8 @@ import com.mmc.oms.common.AuthHandler;
import com.mmc.oms.common.BizException; import com.mmc.oms.common.BizException;
import com.mmc.oms.common.ResultEnum; import com.mmc.oms.common.ResultEnum;
import com.mmc.oms.jwt.JwtConstant; import com.mmc.oms.jwt.JwtConstant;
import com.mmc.oms.model.dto.BaseAccountDTO; import com.mmc.oms.model.dto.user.BaseAccountDTO;
import com.mmc.oms.model.dto.CurrentUserDTO; import com.mmc.oms.model.dto.user.CurrentUserDTO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
...@@ -25,6 +25,7 @@ public abstract class BaseController { ...@@ -25,6 +25,7 @@ public abstract class BaseController {
@Autowired @Autowired
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;
/** /**
* 获取当前用户 * 获取当前用户
* *
...@@ -44,10 +45,10 @@ public abstract class BaseController { ...@@ -44,10 +45,10 @@ public abstract class BaseController {
public BaseAccountDTO getCurrentAccount(HttpServletRequest request) { public BaseAccountDTO getCurrentAccount(HttpServletRequest request) {
String token = request.getHeader("token"); String token = request.getHeader("token");
String json = stringRedisTemplate.opsForValue().get(token); String json = stringRedisTemplate.opsForValue().get(token);
if (StringUtils.isBlank(json)){ if (StringUtils.isBlank(json)) {
throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR); throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
} }
BaseAccountDTO baseAccountDTO= JSONObject.parseObject(json, BaseAccountDTO.class); BaseAccountDTO baseAccountDTO = JSONObject.parseObject(json, BaseAccountDTO.class);
return baseAccountDTO; return baseAccountDTO;
} }
......
src/main/java/com/mmc/oms/controller/CouponBackController.java
package com.mmc.oms.controller; package com.mmc.oms.controller;
import com.mmc.oms.common.*; import com.mmc.oms.common.publicinterface.*;
import com.mmc.oms.model.dto.CouponActivityDTO; import com.mmc.oms.common.result.PageResult;
import com.mmc.oms.model.dto.CouponDTO; import com.mmc.oms.common.result.ResultBody;
import com.mmc.oms.model.dto.CouponUserDTO; import com.mmc.oms.model.dto.coupon.CouponActivityDTO;
import com.mmc.oms.model.dto.CouponViewDTO; import com.mmc.oms.model.dto.coupon.CouponDTO;
import com.mmc.oms.model.dto.coupon.CouponUserDTO;
import com.mmc.oms.model.dto.coupon.CouponViewDTO;
import com.mmc.oms.model.qo.CouponInfoQO; import com.mmc.oms.model.qo.CouponInfoQO;
import com.mmc.oms.model.qo.CouponUserInfoQO; import com.mmc.oms.model.qo.CouponUserInfoQO;
import com.mmc.oms.model.qo.ProductCouponQO; import com.mmc.oms.model.qo.ProductCouponQO;
import com.mmc.oms.model.vo.CouponInfoActivityVO; import com.mmc.oms.model.vo.coupon.CouponInfoActivityVO;
import com.mmc.oms.model.vo.CouponInfoVO; import com.mmc.oms.model.vo.coupon.CouponInfoVO;
import com.mmc.oms.service.CouponBackService; import com.mmc.oms.service.CouponBackService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -36,17 +38,17 @@ public class CouponBackController { ...@@ -36,17 +38,17 @@ public class CouponBackController {
@ApiOperation(value = "V1.0.1--新增优惠券") @ApiOperation(value = "V1.0.1--新增优惠券")
@ApiResponses({ @ApiResponse(code = 200, message = "OK", response = CouponDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
@PostMapping("/save") @PostMapping("/save")
public ResultBody<CouponDTO> saveCouponInfo(@RequestParam(value = "file",required = false) MultipartFile file public ResultBody<CouponDTO> saveCouponInfo(@RequestParam(value = "file", required = false) MultipartFile file
, @RequestBody CouponInfoVO couponInfoVO){ , @RequestBody CouponInfoVO couponInfoVO) {
return couponBackService.saveCouponBackInfo(couponInfoVO,file); return couponBackService.saveCouponBackInfo(couponInfoVO, file);
} }
@ApiOperation(value = "V1.0.1--新增裂变优惠券") @ApiOperation(value = "V1.0.1--新增裂变优惠券")
@ApiResponses({ @ApiResponse(code = 200, message = "OK")}) @ApiResponses({@ApiResponse(code = 200, message = "OK")})
@PostMapping("/saveActivity") @PostMapping("/saveActivity")
public ResultBody saveActivityCouponInfo(@Validated(Insert.class) @RequestBody CouponInfoActivityVO couponInfoActivityVO){ public ResultBody saveActivityCouponInfo(@Validated(Insert.class) @RequestBody CouponInfoActivityVO couponInfoActivityVO) {
return couponBackService.saveActivityCouponInfo(couponInfoActivityVO); return couponBackService.saveActivityCouponInfo(couponInfoActivityVO);
} }
...@@ -81,7 +83,7 @@ public class CouponBackController { ...@@ -81,7 +83,7 @@ public class CouponBackController {
@ApiParam(value = "id", required = true) @ApiParam(value = "id", required = true)
@RequestParam(required = true, value = "id") Integer id, @RequestParam(required = true, value = "id") Integer id,
@ApiParam(value = "数量", required = true) @ApiParam(value = "数量", required = true)
@RequestParam(required = true, value = "count") Integer count){ @RequestParam(required = true, value = "count") Integer count) {
return couponBackService.increaseCouponCount(id, count); return couponBackService.increaseCouponCount(id, count);
} }
...@@ -90,24 +92,24 @@ public class CouponBackController { ...@@ -90,24 +92,24 @@ public class CouponBackController {
@PostMapping("/shutDown") @PostMapping("/shutDown")
public ResultBody shutDown(@Validated(Update.class) public ResultBody shutDown(@Validated(Update.class)
@ApiParam(value = "id", required = true) @ApiParam(value = "id", required = true)
@RequestParam(required = true, value = "id") Integer id){ @RequestParam(required = true, value = "id") Integer id) {
return couponBackService.shutDown(id); return couponBackService.shutDown(id);
} }
@ApiOperation(value = "V1.0.1--获取优惠券使用数据") @ApiOperation(value = "V1.0.1--获取优惠券使用数据")
@ApiResponses({@ApiResponse(code = 200, message = "OK",response = CouponViewDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponViewDTO.class)})
@GetMapping("/getData") @GetMapping("/getData")
public ResultBody<CouponViewDTO> getViewData(@Validated(Query.class) public ResultBody<CouponViewDTO> getViewData(@Validated(Query.class)
@ApiParam(value = "id", required = true) @ApiParam(value = "id", required = true)
@RequestParam(required = true, value = "id") Integer id){ @RequestParam(required = true, value = "id") Integer id) {
return couponBackService.couponViewData(id); return couponBackService.couponViewData(id);
} }
@ApiOperation(value = "V1.0.1--获取优惠券明细列表") @ApiOperation(value = "V1.0.1--获取优惠券明细列表")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)})
@PostMapping("/getUserCouponList") @PostMapping("/getUserCouponList")
public ResultBody<CouponUserDTO> getCouponUserList(@Validated(Page.class) @RequestBody CouponUserInfoQO couponUserInfoQO){ public ResultBody<CouponUserDTO> getCouponUserList(@Validated(Page.class) @RequestBody CouponUserInfoQO couponUserInfoQO) {
return couponBackService.getCouponUserList(couponUserInfoQO); return couponBackService.getCouponUserList(couponUserInfoQO);
} }
...@@ -115,43 +117,43 @@ public class CouponBackController { ...@@ -115,43 +117,43 @@ public class CouponBackController {
@ApiResponses({@ApiResponse(code = 200, message = "OK")}) @ApiResponses({@ApiResponse(code = 200, message = "OK")})
@PostMapping("/downloadCouponUserList") @PostMapping("/downloadCouponUserList")
public void downloadCouponUserList(@Validated(value = {Others.class}) @RequestBody CouponUserInfoQO couponUserInfoQO, public void downloadCouponUserList(@Validated(value = {Others.class}) @RequestBody CouponUserInfoQO couponUserInfoQO,
HttpServletResponse response){ HttpServletResponse response) {
try { try {
couponBackService.downloadCouponUserList(response,couponUserInfoQO); couponBackService.downloadCouponUserList(response, couponUserInfoQO);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ApiOperation(value = "feign-获取优惠券详情",hidden = true) @ApiOperation(value = "feign-获取优惠券详情", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
@GetMapping("/feignByIds") @GetMapping("/feignByIds")
public List<CouponDTO> feignByIds(@RequestParam List<Integer> ids){ public List<CouponDTO> feignByIds(@RequestParam List<Integer> ids) {
return couponBackService.feignByIds(ids); return couponBackService.feignByIds(ids);
} }
@ApiOperation(value = "feign-获取裂变优惠券详情",hidden = true) @ApiOperation(value = "feign-获取裂变优惠券详情", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)})
@GetMapping("/feignGetActivity") @GetMapping("/feignGetActivity")
public CouponActivityDTO feignGetCouponActivityById(@RequestParam Integer id) { public CouponActivityDTO feignGetCouponActivityById(@RequestParam Integer id) {
return couponBackService.getCouponActivityById(id); return couponBackService.getCouponActivityById(id);
} }
@ApiOperation(value = "feign-获取裂变优惠券详情-批量",hidden = true) @ApiOperation(value = "feign-获取裂变优惠券详情-批量", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)})
@PostMapping("/feignGetActivityList") @PostMapping("/feignGetActivityList")
public List<CouponActivityDTO> feignGetCouponActivityByList(@RequestBody List<Integer> id) { public List<CouponActivityDTO> feignGetCouponActivityByList(@RequestBody List<Integer> id) {
return couponBackService.getCouponActivityList(id); return couponBackService.getCouponActivityList(id);
} }
@ApiOperation(value = "feign-优惠券定时修改状态",hidden = true) @ApiOperation(value = "feign-优惠券定时修改状态", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK")}) @ApiResponses({@ApiResponse(code = 200, message = "OK")})
@GetMapping("/feignExpireCoupon") @GetMapping("/feignExpireCoupon")
public void feignExpireCoupon() { public void feignExpireCoupon() {
couponBackService.overdueCouponTask(); couponBackService.overdueCouponTask();
} }
@ApiOperation(value = "feign-根据用户标签获取对应优惠券",hidden = true) @ApiOperation(value = "feign-根据用户标签获取对应优惠券", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
@GetMapping("/feignGetCouponType") @GetMapping("/feignGetCouponType")
public List<CouponDTO> feignGetCouponType(@RequestParam Integer type) { public List<CouponDTO> feignGetCouponType(@RequestParam Integer type) {
...@@ -164,6 +166,7 @@ public class CouponBackController { ...@@ -164,6 +166,7 @@ public class CouponBackController {
public ResultBody<PageResult<CouponDTO>> ordinaryActivities(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) { public ResultBody<PageResult<CouponDTO>> ordinaryActivities(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
return couponBackService.ordinaryActivities(productCouponQO); return couponBackService.ordinaryActivities(productCouponQO);
} }
@ApiOperation(value = "V2.3.2——商品优惠券裂变活动列表") @ApiOperation(value = "V2.3.2——商品优惠券裂变活动列表")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
@PostMapping("/fissionActivity") @PostMapping("/fissionActivity")
......
src/main/java/com/mmc/oms/controller/CouponUserController.java
package com.mmc.oms.controller; package com.mmc.oms.controller;
import com.mmc.oms.common.ResultBody; import com.mmc.oms.common.publicinterface.Update;
import com.mmc.oms.common.Update; import com.mmc.oms.common.result.ResultBody;
import com.mmc.oms.model.dto.*; import com.mmc.oms.model.dto.coupon.CouponListDTO;
import com.mmc.oms.model.vo.CouponUserExchangeVO; import com.mmc.oms.model.dto.coupon.CouponUsageDetailsDTO;
import com.mmc.oms.model.vo.CouponUserVO; import com.mmc.oms.model.dto.coupon.CouponUserDTO;
import com.mmc.oms.model.dto.coupon.CouponUserOrderDTO;
import com.mmc.oms.model.dto.goods.AppGoodsInfoDTO;
import com.mmc.oms.model.dto.order.OrderCouponDTO;
import com.mmc.oms.model.dto.user.BaseAccountDTO;
import com.mmc.oms.model.vo.coupon.CouponUserExchangeVO;
import com.mmc.oms.model.vo.coupon.CouponUserVO;
import com.mmc.oms.service.CouponUserService; import com.mmc.oms.service.CouponUserService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -33,7 +39,7 @@ public class CouponUserController extends BaseController { ...@@ -33,7 +39,7 @@ public class CouponUserController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)})
@GetMapping("/checkMyCoupon") @GetMapping("/checkMyCoupon")
public ResultBody getMyCoupon(@ApiParam(value = "状态 1：已使用, 2:已失效，3:已转赠") public ResultBody getMyCoupon(@ApiParam(value = "状态 1：已使用, 2:已失效，3:已转赠")
@RequestParam(value = "status",required = false) Integer status, @RequestParam(value = "status", required = false) Integer status,
@ApiParam(value = "页码", required = true) @ApiParam(value = "页码", required = true)
@RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageNo") Integer pageNo,
@ApiParam(value = "每页显示数", required = true) @ApiParam(value = "每页显示数", required = true)
...@@ -62,7 +68,7 @@ public class CouponUserController extends BaseController { ...@@ -62,7 +68,7 @@ public class CouponUserController extends BaseController {
@ApiParam(value = "用户uid", required = true) @ApiParam(value = "用户uid", required = true)
@RequestParam(value = "uid") String uid, @RequestParam(value = "uid") String uid,
HttpServletRequest request) { HttpServletRequest request) {
return couponUserService.presentedCoupon(id, uid,this.getCurrentAccount(request)); return couponUserService.presentedCoupon(id, uid, this.getCurrentAccount(request));
} }
...@@ -80,14 +86,14 @@ public class CouponUserController extends BaseController { ...@@ -80,14 +86,14 @@ public class CouponUserController extends BaseController {
} }
@ApiOperation(value = "feign-根据订单品牌获取可用优惠券",hidden = true) @ApiOperation(value = "feign-根据订单品牌获取可用优惠券", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserOrderDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserOrderDTO.class)})
@GetMapping("/feignCoupons") @GetMapping("/feignCoupons")
public List<CouponUserOrderDTO> couponByOrder(@ApiParam(value = "品牌id 搜索品牌指定优惠卷", required = true) public List<CouponUserOrderDTO> couponByOrder(@ApiParam(value = "品牌id 搜索品牌指定优惠卷", required = true)
@RequestParam(value = "primaryKey") List<Integer> primaryKey, @RequestParam(value = "primaryKey") List<Integer> primaryKey,
@ApiParam(value = "用户id", required = true) @ApiParam(value = "用户id", required = true)
@RequestParam Integer uid) { @RequestParam Integer uid) {
return couponUserService.getUsableCoupon(primaryKey,uid); return couponUserService.getUsableCoupon(primaryKey, uid);
} }
...@@ -113,7 +119,7 @@ public class CouponUserController extends BaseController { ...@@ -113,7 +119,7 @@ public class CouponUserController extends BaseController {
return couponUserService.feignExchangeCoupon(couponUserExchangeVO); return couponUserService.feignExchangeCoupon(couponUserExchangeVO);
} }
@ApiOperation(value = "feign-领取优惠券",hidden = true) @ApiOperation(value = "feign-领取优惠券", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK")}) @ApiResponses({@ApiResponse(code = 200, message = "OK")})
@GetMapping("/feignReceive") @GetMapping("/feignReceive")
public ResultBody feignReceive(@ApiParam(value = "优惠券id", required = true) public ResultBody feignReceive(@ApiParam(value = "优惠券id", required = true)
...@@ -128,7 +134,7 @@ public class CouponUserController extends BaseController { ...@@ -128,7 +134,7 @@ public class CouponUserController extends BaseController {
return couponUserService.receiveCoupon(id, countDTO); return couponUserService.receiveCoupon(id, countDTO);
} }
@ApiOperation(value = "feign-根据优惠券id查询优惠券",hidden = true) @ApiOperation(value = "feign-根据优惠券id查询优惠券", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK")}) @ApiResponses({@ApiResponse(code = 200, message = "OK")})
@PostMapping("/feignListUserCouponsByIds") @PostMapping("/feignListUserCouponsByIds")
@ApiIgnore @ApiIgnore
...@@ -144,14 +150,14 @@ public class CouponUserController extends BaseController { ...@@ -144,14 +150,14 @@ public class CouponUserController extends BaseController {
return couponUserService.feignOrderCoupon(orderId); return couponUserService.feignOrderCoupon(orderId);
} }
@ApiOperation(value = "feign-优惠券定时过期",hidden = true) @ApiOperation(value = "feign-优惠券定时过期", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK")}) @ApiResponses({@ApiResponse(code = 200, message = "OK")})
@GetMapping("/feignExpire") @GetMapping("/feignExpire")
public void feignExpire() { public void feignExpire() {
couponUserService.overdueTask(); couponUserService.overdueTask();
} }
@ApiOperation(value = "feign-优惠券回退",hidden = true) @ApiOperation(value = "feign-优惠券回退", hidden = true)
@ApiResponses({@ApiResponse(code = 200, message = "OK")}) @ApiResponses({@ApiResponse(code = 200, message = "OK")})
@PostMapping("/feignRollbackCoupons") @PostMapping("/feignRollbackCoupons")
public Boolean feignRollbackCoupons(@RequestBody List<OrderCouponDTO> orderCouponDTOS) { public Boolean feignRollbackCoupons(@RequestBody List<OrderCouponDTO> orderCouponDTOS) {
...@@ -181,10 +187,10 @@ public class CouponUserController extends BaseController { ...@@ -181,10 +187,10 @@ public class CouponUserController extends BaseController {
@ApiImplicitParam(name = "useType", required = false, value = "1vip券, 2品牌券"), @ApiImplicitParam(name = "useType", required = false, value = "1vip券, 2品牌券"),
}) })
@GetMapping("/couponMerchandise") @GetMapping("/couponMerchandise")
public ResultBody couponMerchandise(@RequestParam(value = "couponId",required = false) Integer couponId, public ResultBody couponMerchandise(@RequestParam(value = "couponId", required = false) Integer couponId,
@RequestParam(value = "productName",required = false) String productName, @RequestParam(value = "productName", required = false) String productName,
@RequestParam(value = "useType",required = false) Integer useType) { @RequestParam(value = "useType", required = false) Integer useType) {
return couponUserService.couponMerchandise(couponId,productName,useType); return couponUserService.couponMerchandise(couponId, productName, useType);
} }
@ApiOperation(value = "V2.3.2-优惠券使用明细 ") @ApiOperation(value = "V2.3.2-优惠券使用明细 ")
...@@ -193,7 +199,7 @@ public class CouponUserController extends BaseController { ...@@ -193,7 +199,7 @@ public class CouponUserController extends BaseController {
}) })
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUsageDetailsDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUsageDetailsDTO.class)})
@GetMapping("/couponUsageDetails") @GetMapping("/couponUsageDetails")
public ResultBody couponUsageDetails(@RequestParam(value = "uid",required = true) Integer uid) { public ResultBody couponUsageDetails(@RequestParam(value = "uid", required = true) Integer uid) {
return couponUserService.couponUsageDetails(uid); return couponUserService.couponUsageDetails(uid);
} }
......
src/main/java/com/mmc/oms/controller/OrderLogisticsController.java
package com.mmc.oms.controller; package com.mmc.oms.controller;
import com.mmc.oms.common.ResultBody; import com.mmc.oms.common.result.ResultBody;
import com.mmc.oms.model.dto.*; import com.mmc.oms.model.dto.kdn.KdnDicDTO;
import com.mmc.oms.model.dto.order.ExpressInfoDTO;
import com.mmc.oms.model.dto.order.OrderInfoDTO;
import com.mmc.oms.model.dto.order.OrderReceiptDTO;
import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
import com.mmc.oms.service.OrderLogisticsService; import com.mmc.oms.service.OrderLogisticsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
src/main/java/com/mmc/oms/controller/OrderRefundController.java
package com.mmc.oms.controller; package com.mmc.oms.controller;
import com.mmc.oms.common.ResultBody; import com.mmc.oms.common.result.ResultBody;
import com.mmc.oms.model.vo.OrderRefundVO; import com.mmc.oms.model.vo.order.OrderRefundVO;
import com.mmc.oms.model.vo.RefundYesOrNoVO; import com.mmc.oms.model.vo.order.RefundYesOrNoVO;
import com.mmc.oms.service.OrderRefundService; import com.mmc.oms.service.OrderRefundService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
src/main/java/com/mmc/oms/controller/RentalOrdersController.java
package com.mmc.oms.controller; package com.mmc.oms.controller;
import com.mmc.oms.common.ResultBody; import com.mmc.oms.common.publicinterface.Send;
import com.mmc.oms.common.Send; import com.mmc.oms.common.publicinterface.Take;
import com.mmc.oms.common.Take; import com.mmc.oms.common.result.ResultBody;
import com.mmc.oms.model.dto.OrderInfoDTO; import com.mmc.oms.model.dto.order.OrderInfoDTO;
import com.mmc.oms.model.qo.OrderInfoQO; import com.mmc.oms.model.qo.OrderInfoQO;
import com.mmc.oms.model.vo.LeaseOrderVO; import com.mmc.oms.model.vo.order.LeaseOrderVO;
import com.mmc.oms.model.vo.OrderStatusVO; import com.mmc.oms.model.vo.order.OrderStatusVO;
import com.mmc.oms.model.vo.OrderVcuVO; import com.mmc.oms.model.vo.order.OrderVcuVO;
import com.mmc.oms.model.vo.ReturnWareVO; import com.mmc.oms.model.vo.order.ReturnWareVO;
import com.mmc.oms.service.RentalOrdersService; import com.mmc.oms.service.RentalOrdersService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -31,7 +31,7 @@ public class RentalOrdersController extends BaseController { ...@@ -31,7 +31,7 @@ public class RentalOrdersController extends BaseController {
@ApiOperation(value = "租赁-下单") @ApiOperation(value = "租赁-下单")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
@PostMapping("feignAddLease") @PostMapping("feignAddLease")
public OrderInfoDTO feignAddLease(HttpServletRequest request, @RequestBody LeaseOrderVO param) { public ResultBody<OrderInfoDTO> feignAddLease(HttpServletRequest request, @RequestBody LeaseOrderVO param) {
return rentalOrdersService.feignAddLease(this.getCurrentAccount(request), param); return rentalOrdersService.feignAddLease(this.getCurrentAccount(request), param);
} }
......
src/main/java/com/mmc/oms/dao/CouponBackDao.java
package com.mmc.oms.dao; package com.mmc.oms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mmc.oms.entity.CouponDO; import com.mmc.oms.entity.coupon.CouponDO;
import com.mmc.oms.entity.ProductInformationDo; import com.mmc.oms.entity.order.ProductInformationDo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
......
src/main/java/com/mmc/oms/dao/CouponUserDao.java
package com.mmc.oms.dao; package com.mmc.oms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mmc.oms.entity.CouponUsageDetailsDO; import com.mmc.oms.entity.coupon.CouponUsageDetailsDO;
import com.mmc.oms.entity.CouponUserDO; import com.mmc.oms.entity.coupon.CouponUserDO;
import com.mmc.oms.entity.GoodsInfoDO; import com.mmc.oms.entity.goods.GoodsInfoDO;
import com.mmc.oms.model.dto.CouponUserDTO; import com.mmc.oms.model.dto.coupon.CouponUserDTO;
import com.mmc.oms.model.qo.CouponUserInfoQO; import com.mmc.oms.model.qo.CouponUserInfoQO;
import com.mmc.oms.model.vo.CouponUserVO; import com.mmc.oms.model.vo.coupon.CouponUserVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -35,7 +35,7 @@ public interface CouponUserDao extends BaseMapper<CouponUserDO> { ...@@ -35,7 +35,7 @@ public interface CouponUserDao extends BaseMapper<CouponUserDO> {
List<Integer> merchandise(Integer couponId); List<Integer> merchandise(Integer couponId);
List<GoodsInfoDO> couponMerchandise(List<Integer> merchandise,String productName); List<GoodsInfoDO> couponMerchandise(List<Integer> merchandise, String productName);
List<CouponUsageDetailsDO> couponUsageDetails(Integer uid); List<CouponUsageDetailsDO> couponUsageDetails(Integer uid);
......
src/main/java/com/mmc/oms/dao/OrderLogisticsDao.java
package com.mmc.oms.dao; package com.mmc.oms.dao;
import com.mmc.oms.entity.*; import com.mmc.oms.entity.order.*;
import com.mmc.oms.entity.transtatus.TranStatusDicDO;
import com.mmc.oms.model.qo.OrderInfoQO; import com.mmc.oms.model.qo.OrderInfoQO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -46,7 +47,7 @@ public interface OrderLogisticsDao { ...@@ -46,7 +47,7 @@ public interface OrderLogisticsDao {
List<OrderInfoDO> listPcOrderInfo(OrderInfoQO param); List<OrderInfoDO> listPcOrderInfo(OrderInfoQO param);
int countOrderInfo(String tranStatus,List<Integer> companys); int countOrderInfo(String tranStatus, List<Integer> companys);
List<ExpressInfoDO> listExpressInfo(); List<ExpressInfoDO> listExpressInfo();
...@@ -68,5 +69,5 @@ public interface OrderLogisticsDao { ...@@ -68,5 +69,5 @@ public interface OrderLogisticsDao {
Integer getOrderInfoCountToYesterday(@Param("day") Integer day, @Param("date") Date date); Integer getOrderInfoCountToYesterday(@Param("day") Integer day, @Param("date") Date date);
Integer getOrderInfoCount(@Param("day") Integer day,@Param("date")Date date); Integer getOrderInfoCount(@Param("day") Integer day, @Param("date") Date date);
} }
src/main/java/com/mmc/oms/dao/OrderRefundDao.java
package com.mmc.oms.dao; package com.mmc.oms.dao;
import com.mmc.oms.entity.OrderRefundDO; import com.mmc.oms.entity.order.OrderRefundDO;
import com.mmc.oms.entity.OrderVcuDO; import com.mmc.oms.entity.order.OrderVcuDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
......
src/main/java/com/mmc/oms/dao/RentalOrdersDao.java
package com.mmc.oms.dao; package com.mmc.oms.dao;
import com.mmc.oms.entity.*; import com.mmc.oms.entity.coupon.CouponDO;
import com.mmc.oms.entity.coupon.CouponUserDO;
import com.mmc.oms.entity.order.*;
import com.mmc.oms.model.qo.OrderInfoQO; import com.mmc.oms.model.qo.OrderInfoQO;
import com.mmc.oms.model.vo.OrderStatusVO; import com.mmc.oms.model.vo.order.OrderStatusVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
......
src/main/java/com/mmc/oms/entity/ChannelCouponDO.java → src/main/java/com/mmc/oms/entity/coupon/ChannelCouponDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.coupon;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
......
src/main/java/com/mmc/oms/entity/CouponDO.java → src/main/java/com/mmc/oms/entity/coupon/CouponDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.coupon;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.mmc.oms.common.CouponConstants; import com.mmc.oms.common.coupon.CouponConstants;
import com.mmc.oms.model.dto.CouponActivityDTO; import com.mmc.oms.model.dto.coupon.CouponActivityDTO;
import com.mmc.oms.model.dto.CouponDTO; import com.mmc.oms.model.dto.coupon.CouponDTO;
import com.mmc.oms.model.dto.CouponListDTO; import com.mmc.oms.model.dto.coupon.CouponListDTO;
import com.mmc.oms.model.vo.CouponInfoActivityVO; import com.mmc.oms.model.vo.coupon.CouponInfoActivityVO;
import com.mmc.oms.model.vo.CouponInfoVO; import com.mmc.oms.model.vo.coupon.CouponInfoVO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -27,13 +27,13 @@ import java.util.Date; ...@@ -27,13 +27,13 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("coupon") @TableName("coupon")
@ApiModel(value="Coupon对象", description="优惠券表") @ApiModel(value = "Coupon对象", description = "优惠券表")
public class CouponDO implements Serializable { public class CouponDO implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "优惠券ID") @ApiModelProperty(value = "优惠券ID")
@TableId(value = "id",type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
@ApiModelProperty(value = "优惠券名称") @ApiModelProperty(value = "优惠券名称")
...@@ -109,7 +109,7 @@ public class CouponDO implements Serializable { ...@@ -109,7 +109,7 @@ public class CouponDO implements Serializable {
@ApiModelProperty(value = "是否多次核销 0单次核销 1多次核销") @ApiModelProperty(value = "是否多次核销 0单次核销 1多次核销")
private Boolean verificationType; private Boolean verificationType;
@TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE) @TableField(value = "create_time", fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
...@@ -120,15 +120,14 @@ public class CouponDO implements Serializable { ...@@ -120,15 +120,14 @@ public class CouponDO implements Serializable {
private Integer parentId; private Integer parentId;
@ApiModelProperty(value = "分享者-分享人数") @ApiModelProperty(value = "分享者-分享人数")
private Integer peopleNumber ; private Integer peopleNumber;
@ApiModelProperty(value = "批量导入文件url") @ApiModelProperty(value = "批量导入文件url")
private String fileUrl ; private String fileUrl;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "已领取的数量") @ApiModelProperty(value = "已领取的数量")
private String quantityClaimed ; private String quantityClaimed;
public CouponDTO bilIdCouponDTO() { public CouponDTO bilIdCouponDTO() {
...@@ -190,7 +189,7 @@ public class CouponDO implements Serializable { ...@@ -190,7 +189,7 @@ public class CouponDO implements Serializable {
} }
@Tolerate @Tolerate
public CouponDO(CouponInfoActivityVO couponInfoActivityVO){ public CouponDO(CouponInfoActivityVO couponInfoActivityVO) {
this.couponName = couponInfoActivityVO.getCouponName(); this.couponName = couponInfoActivityVO.getCouponName();
this.useType = couponInfoActivityVO.getUseType(); this.useType = couponInfoActivityVO.getUseType();
this.primaryKey = couponInfoActivityVO.getPrimaryKey(); this.primaryKey = couponInfoActivityVO.getPrimaryKey();
...@@ -212,7 +211,7 @@ public class CouponDO implements Serializable { ...@@ -212,7 +211,7 @@ public class CouponDO implements Serializable {
} }
@Tolerate @Tolerate
public CouponDO(CouponInfoActivityVO couponInfoActivityVO, Integer type){ public CouponDO(CouponInfoActivityVO couponInfoActivityVO, Integer type) {
this.couponName = couponInfoActivityVO.getCouponName(); this.couponName = couponInfoActivityVO.getCouponName();
this.useType = couponInfoActivityVO.getBeSharedUseType(); this.useType = couponInfoActivityVO.getBeSharedUseType();
this.primaryKey = couponInfoActivityVO.getBeSharedPrimaryKey(); this.primaryKey = couponInfoActivityVO.getBeSharedPrimaryKey();
......
src/main/java/com/mmc/oms/entity/CouponUsageDetailsDO.java → src/main/java/com/mmc/oms/entity/coupon/CouponUsageDetailsDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.coupon;
import com.mmc.oms.model.dto.CouponUsageDetailsDTO; import com.mmc.oms.model.dto.coupon.CouponUsageDetailsDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/entity/CouponUserDO.java → src/main/java/com/mmc/oms/entity/coupon/CouponUserDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.coupon;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.mmc.oms.common.CouponConstants; import com.mmc.oms.common.coupon.CouponConstants;
import com.mmc.oms.model.dto.CouponUserDTO; import com.mmc.oms.model.dto.coupon.CouponUserDTO;
import com.mmc.oms.model.dto.CouponUserOrderDTO; import com.mmc.oms.model.dto.coupon.CouponUserOrderDTO;
import com.mmc.oms.model.vo.CouponUserExchangeVO; import com.mmc.oms.model.vo.coupon.CouponUserExchangeVO;
import com.mmc.oms.model.vo.CouponUserVO; import com.mmc.oms.model.vo.coupon.CouponUserVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
......
src/main/java/com/mmc/oms/entity/GoodsInfoDO.java → src/main/java/com/mmc/oms/entity/goods/GoodsInfoDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.goods;
import com.mmc.oms.model.dto.AppGoodsInfoDTO; import com.mmc.oms.model.dto.goods.AppGoodsInfoDTO;
import com.mmc.oms.model.dto.GoodsInfoListDTO; import com.mmc.oms.model.dto.goods.GoodsInfoListDTO;
import com.mmc.oms.model.dto.GoodsRcdDTO; import com.mmc.oms.model.dto.goods.GoodsRcdDTO;
import com.mmc.oms.model.dto.TypeGoodsInfoDTO; import com.mmc.oms.model.dto.goods.TypeGoodsInfoDTO;
import com.mmc.oms.model.vo.CategoryParamAndValueVO; import com.mmc.oms.model.vo.category.CategoryParamAndValueVO;
import com.mmc.oms.model.vo.GoodsAddVO; import com.mmc.oms.model.vo.goods.GoodsAddVO;
import com.mmc.oms.model.vo.MallGoodsAddVO; import com.mmc.oms.model.vo.goods.MallGoodsAddVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -68,6 +68,7 @@ public class GoodsInfoDO implements Serializable { ...@@ -68,6 +68,7 @@ public class GoodsInfoDO implements Serializable {
// private GoodsConfigExportDO goodsConfigExport;// 功能清单 // private GoodsConfigExportDO goodsConfigExport;// 功能清单
private Integer buyNum;// 购买数量 private Integer buyNum;// 购买数量
private String directoryName; private String directoryName;
/** /**
* 辅助字段-end * 辅助字段-end
*/ */
......
src/main/java/com/mmc/oms/entity/ExpressInfoDO.java → src/main/java/com/mmc/oms/entity/order/ExpressInfoDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.model.dto.ExpressInfoDTO; import com.mmc.oms.model.dto.order.ExpressInfoDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/oms/entity/KdnDicDO.java → src/main/java/com/mmc/oms/entity/order/KdnDicDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.model.dto.KdnDicDTO; import com.mmc.oms.model.dto.kdn.KdnDicDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/oms/entity/OrderInfoDO.java → src/main/java/com/mmc/oms/entity/order/OrderInfoDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.common.CodeUtil; import com.mmc.oms.common.status.TranStatusDic;
import com.mmc.oms.common.TranStatusDic; import com.mmc.oms.common.util.CodeUtil;
import com.mmc.oms.model.dto.OrderInfoDTO; import com.mmc.oms.model.dto.order.OrderInfoDTO;
import com.mmc.oms.model.vo.LeaseOrderVO; import com.mmc.oms.model.vo.order.LeaseOrderVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/entity/OrderReceiptDO.java → src/main/java/com/mmc/oms/entity/order/OrderReceiptDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.model.dto.OrderReceiptDTO; import com.mmc.oms.model.dto.order.OrderReceiptDTO;
import com.mmc.oms.model.vo.OrderReceiptVO; import com.mmc.oms.model.vo.order.OrderReceiptVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/entity/OrderRefundDO.java → src/main/java/com/mmc/oms/entity/order/OrderRefundDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.model.dto.OrderRefundDTO; import com.mmc.oms.model.dto.order.OrderRefundDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/oms/entity/OrderStatusDO.java → src/main/java/com/mmc/oms/entity/order/OrderStatusDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.model.dto.OrderStatusDTO; import com.mmc.oms.model.dto.order.OrderStatusDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/entity/OrderVcuDO.java → src/main/java/com/mmc/oms/entity/order/OrderVcuDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.model.dto.OrderVcuDTO; import com.mmc.oms.model.dto.order.OrderVcuDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/entity/ProductInformationDo.java → src/main/java/com/mmc/oms/entity/order/ProductInformationDo.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
......
src/main/java/com/mmc/oms/entity/RepoCashDO.java → src/main/java/com/mmc/oms/entity/order/RepoCashDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.order;
import com.mmc.oms.model.dto.RepoCashDTO; import com.mmc.oms.model.dto.repo.RepoCashDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/entity/TranStatusDicDO.java → src/main/java/com/mmc/oms/entity/transtatus/TranStatusDicDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.transtatus;
import com.mmc.oms.model.dto.TranStatusDicDTO; import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/oms/entity/WareImgDO.java → src/main/java/com/mmc/oms/entity/ware/WareImgDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.ware;
import com.mmc.oms.model.dto.WareImgDTO; import com.mmc.oms.model.dto.ware.WareImgDTO;
import com.mmc.oms.model.vo.WareImgVO; import com.mmc.oms.model.vo.ware.WareImgVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/oms/entity/WareInfoDO.java → src/main/java/com/mmc/oms/entity/ware/WareInfoDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.ware;
import com.mmc.oms.model.dto.AppletWareInfoDTO; import com.mmc.oms.model.dto.ware.AppletWareInfoDTO;
import com.mmc.oms.model.dto.WareInfoDTO; import com.mmc.oms.model.dto.ware.WareInfoDTO;
import com.mmc.oms.model.dto.WareInfoFirstPageDTO; import com.mmc.oms.model.dto.ware.WareInfoFirstPageDTO;
import com.mmc.oms.model.dto.WareInfoItemDTO; import com.mmc.oms.model.dto.ware.WareInfoItemDTO;
import com.mmc.oms.model.vo.WareInfoVO; import com.mmc.oms.model.vo.ware.WareInfoVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -45,7 +45,9 @@ public class WareInfoDO implements Serializable { ...@@ -45,7 +45,9 @@ public class WareInfoDO implements Serializable {
private Date updateTime; private Date updateTime;
private Integer pid; private Integer pid;
/** 辅助字段-start */ /**
* 辅助字段-start
*/
private List<WareImgDO> wareImgs; private List<WareImgDO> wareImgs;
// private List<WareVideoDO> wareVideos; // private List<WareVideoDO> wareVideos;
private WarePropDO warePropDO; private WarePropDO warePropDO;
...@@ -53,7 +55,9 @@ public class WareInfoDO implements Serializable { ...@@ -53,7 +55,9 @@ public class WareInfoDO implements Serializable {
// private WareDetailDO wareDetailDO; // private WareDetailDO wareDetailDO;
// private List<SkuInfoDO> skuInfoDOList; // private List<SkuInfoDO> skuInfoDOList;
/** 辅助字段-end */ /**
* 辅助字段-end
*/
public WareInfoDTO buildWareInfoDTO() { public WareInfoDTO buildWareInfoDTO() {
return WareInfoDTO.builder() return WareInfoDTO.builder()
.id(this.id) .id(this.id)
......
src/main/java/com/mmc/oms/entity/WarePropDO.java → src/main/java/com/mmc/oms/entity/ware/WarePropDO.java
package com.mmc.oms.entity; package com.mmc.oms.entity.ware;
import com.mmc.oms.model.dto.WarePropDTO; import com.mmc.oms.model.dto.ware.WarePropDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -24,7 +24,7 @@ public class WarePropDO implements Serializable { ...@@ -24,7 +24,7 @@ public class WarePropDO implements Serializable {
private String propPoster; private String propPoster;
private Date createTime; private Date createTime;
public WarePropDTO buildWarePropDTO(){ public WarePropDTO buildWarePropDTO() {
return WarePropDTO.builder().id(this.id).wareInfoId(this.wareInfoId).propInfoId(this.propInfoId).propPoster(this.propPoster).createTime(this.createTime).build(); return WarePropDTO.builder().id(this.id).wareInfoId(this.wareInfoId).propInfoId(this.propInfoId).propPoster(this.propPoster).createTime(this.createTime).build();
} }
} }
src/main/java/com/mmc/oms/filter/AuthSignatureFilter.java
package com.mmc.oms.filter; package com.mmc.oms.filter;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.mmc.oms.common.ResultBody;
import com.mmc.oms.common.ResultEnum; import com.mmc.oms.common.ResultEnum;
import com.mmc.oms.common.Tenant; import com.mmc.oms.common.Tenant;
import com.mmc.oms.common.result.ResultBody;
import com.mmc.oms.config.Audience; import com.mmc.oms.config.Audience;
import com.mmc.oms.config.TenantContext; import com.mmc.oms.config.TenantContext;
import com.mmc.oms.model.dto.UserAccountDTO; import com.mmc.oms.model.dto.user.UserAccountDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/mmc/oms/model/dto/CompanyCacheDTO.java → src/main/java/com/mmc/oms/model/dto/company/CompanyCacheDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.company;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -23,8 +23,8 @@ public class CompanyCacheDTO implements Serializable { ...@@ -23,8 +23,8 @@ public class CompanyCacheDTO implements Serializable {
private Integer id; private Integer id;
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "单位名称")
private String company; private String company;
@ApiModelProperty(value = "是否为管理单位：0否 1是",hidden = true) @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
private Integer manage; private Integer manage;
@ApiModelProperty(value = "当前单位ID+子级单位ID的集合",hidden = true) @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
private List<Integer> companys; private List<Integer> companys;
} }
src/main/java/com/mmc/oms/model/dto/CompanyInfoDTO.java → src/main/java/com/mmc/oms/model/dto/company/CompanyInfoDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.company;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/model/dto/CompanySimpleDTO.java → src/main/java/com/mmc/oms/model/dto/company/CompanySimpleDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.company;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -28,8 +27,8 @@ public class CompanySimpleDTO implements Serializable { ...@@ -28,8 +27,8 @@ public class CompanySimpleDTO implements Serializable {
private String company; private String company;
@ApiModelProperty(value = "账号类型:0合伙人 1员工") @ApiModelProperty(value = "账号类型:0合伙人 1员工")
private Integer userType; private Integer userType;
@ApiModelProperty(value = "是否为管理单位：0否 1是",hidden = true) @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
private Integer manage; private Integer manage;
@ApiModelProperty(value = "当前单位ID+子级单位ID的集合",hidden = true) @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
private List<Integer> companys; private List<Integer> companys;
} }
src/main/java/com/mmc/oms/model/dto/CouponActivityDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponActivityDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.AllArgsConstructor;
import lombok.experimental.Accessors; import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -24,7 +25,7 @@ import java.util.Date; ...@@ -24,7 +25,7 @@ import java.util.Date;
public class CouponActivityDTO implements Serializable { public class CouponActivityDTO implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "优惠券ID") @ApiModelProperty(value = "优惠券ID")
private Integer id; private Integer id;
......
src/main/java/com/mmc/oms/model/dto/CouponDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -24,7 +23,7 @@ import java.util.Date; ...@@ -24,7 +23,7 @@ import java.util.Date;
public class CouponDTO implements Serializable { public class CouponDTO implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "优惠券ID") @ApiModelProperty(value = "优惠券ID")
private Integer id; private Integer id;
...@@ -102,5 +101,5 @@ public class CouponDTO implements Serializable { ...@@ -102,5 +101,5 @@ public class CouponDTO implements Serializable {
private String fileUrl; private String fileUrl;
@ApiModelProperty(value = "已领取的数量") @ApiModelProperty(value = "已领取的数量")
private String quantityClaimed ; private String quantityClaimed;
} }
src/main/java/com/mmc/oms/model/dto/CouponListDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponListDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -23,7 +22,7 @@ import java.util.Date; ...@@ -23,7 +22,7 @@ import java.util.Date;
//@ApiModel(value="CouponList对象", description="小程序优惠券表") //@ApiModel(value="CouponList对象", description="小程序优惠券表")
public class CouponListDTO implements Serializable { public class CouponListDTO implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "优惠券ID") @ApiModelProperty(value = "优惠券ID")
private Integer id; private Integer id;
......
src/main/java/com/mmc/oms/model/dto/CouponUsageDetailsDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponUsageDetailsDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/CouponUserDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponUserDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.coupon;
import cn.afterturn.easypoi.excel.annotation.ExcelTarget; import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -36,7 +34,7 @@ public class CouponUserDTO implements Serializable { ...@@ -36,7 +34,7 @@ public class CouponUserDTO implements Serializable {
@ApiModelProperty(value = "优惠券id") @ApiModelProperty(value = "优惠券id")
private Integer couponId; private Integer couponId;
@JsonSerialize(using= ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "订单id") @ApiModelProperty(value = "订单id")
private Long cid; private Long cid;
......
src/main/java/com/mmc/oms/model/dto/CouponUserOrderDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponUserOrderDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -24,7 +23,7 @@ import java.util.List; ...@@ -24,7 +23,7 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
public class CouponUserOrderDTO implements Serializable { public class CouponUserOrderDTO implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private Integer id; private Integer id;
......
src/main/java/com/mmc/oms/model/dto/CouponViewDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponViewDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.coupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -15,7 +14,7 @@ import java.io.Serializable; ...@@ -15,7 +14,7 @@ import java.io.Serializable;
//@ApiModel(value="用户优惠券使用数据", description="用户优惠券使用数据DTO") //@ApiModel(value="用户优惠券使用数据", description="用户优惠券使用数据DTO")
public class CouponViewDTO implements Serializable { public class CouponViewDTO implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "总发行量") @ApiModelProperty(value = "总发行量")
private Integer couponTotal; private Integer couponTotal;
......
src/main/java/com/mmc/oms/model/dto/FlyerAccountDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerAccountDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.flyer;
import com.mmc.oms.common.FlyerAccountType; import com.mmc.oms.common.FlyerAccountType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/FlyerEntInfoDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerEntInfoDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.flyer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/FlyerOrderTaskDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerOrderTaskDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.flyer;
import com.mmc.oms.model.dto.order.OrderTaskDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/model/dto/FlyerScenesAuthDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerScenesAuthDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.flyer;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/oms/model/dto/AppGoodsInfoDTO.java → src/main/java/com/mmc/oms/model/dto/goods/AppGoodsInfoDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.goods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/GoodsInfoListDTO.java → src/main/java/com/mmc/oms/model/dto/goods/GoodsInfoListDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.goods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/GoodsRcdDTO.java → src/main/java/com/mmc/oms/model/dto/goods/GoodsRcdDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.goods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/TypeGoodsInfoDTO.java → src/main/java/com/mmc/oms/model/dto/goods/TypeGoodsInfoDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.goods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/KdnDicDTO.java → src/main/java/com/mmc/oms/model/dto/kdn/KdnDicDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.kdn;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/KdnExpDTO.java → src/main/java/com/mmc/oms/model/dto/kdn/KdnExpDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.kdn;
import io.swagger.annotations.ApiModel; import com.mmc.oms.model.dto.order.ExpStationsDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/CountOrderDTO.java → src/main/java/com/mmc/oms/model/dto/order/CountOrderDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/ExpStationsDTO.java → src/main/java/com/mmc/oms/model/dto/order/ExpStationsDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/model/dto/ExpressInfoDTO.java → src/main/java/com/mmc/oms/model/dto/order/ExpressInfoDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/OrderCouponDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderCouponDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/OrderInfoDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderInfoDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import com.mmc.oms.entity.RepoCashDO; import com.mmc.oms.entity.order.RepoCashDO;
import com.mmc.oms.model.dto.kdn.KdnExpDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/OrderReceiptDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderReceiptDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/oms/model/dto/OrderRefundDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderRefundDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import com.mmc.oms.model.dto.repo.RepoCashDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/OrderStatusDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderStatusDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/oms/model/dto/OrderTaskDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderTaskDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import com.mmc.oms.model.dto.flyer.FlyerAccountDTO;
import com.mmc.oms.model.dto.flyer.FlyerOrderTaskDTO;
import com.mmc.oms.model.dto.user.UserAccountDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -160,7 +163,7 @@ public class OrderTaskDTO implements Serializable { ...@@ -160,7 +163,7 @@ public class OrderTaskDTO implements Serializable {
this.userPhoneNum = wx.getPhoneNum(); this.userPhoneNum = wx.getPhoneNum();
} }
public FlyerOrderTaskDTO buildFlyerOrderTaskDTO(){ public FlyerOrderTaskDTO buildFlyerOrderTaskDTO() {
return FlyerOrderTaskDTO.builder().orderId(this.id).orderNo(this.orderNo).orderName(this.orderName).build(); return FlyerOrderTaskDTO.builder().orderId(this.id).orderNo(this.orderNo).orderName(this.orderName).build();
} }
} }
src/main/java/com/mmc/oms/model/dto/OrderTaskSonDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderTaskSonDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/oms/model/dto/OrderVcuDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderVcuDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/PayCashResultDTO.java → src/main/java/com/mmc/oms/model/dto/order/PayCashResultDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/RefundLogDTO.java → src/main/java/com/mmc/oms/model/dto/order/RefundLogDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/ShareOrderDTO.java → src/main/java/com/mmc/oms/model/dto/order/ShareOrderDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/oms/model/dto/SkuOrderDTO.java → src/main/java/com/mmc/oms/model/dto/order/SkuOrderDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/oms/model/dto/TaskFlyerCostDTO.java → src/main/java/com/mmc/oms/model/dto/order/TaskFlyerCostDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.order;
import io.swagger.annotations.ApiModel; import com.mmc.oms.model.dto.ware.WagTermDetailDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -92,7 +92,7 @@ public class TaskFlyerCostDTO implements Serializable { ...@@ -92,7 +92,7 @@ public class TaskFlyerCostDTO implements Serializable {
this.payPersent = BigDecimal.ZERO; this.payPersent = BigDecimal.ZERO;
} }
if(this.hotSudy == null) { if (this.hotSudy == null) {
this.hotSudy = BigDecimal.ZERO; this.hotSudy = BigDecimal.ZERO;
} }
} }
......
src/main/java/com/mmc/oms/model/dto/RepoAccountDTO.java → src/main/java/com/mmc/oms/model/dto/repo/RepoAccountDTO.java
package com.mmc.oms.model.dto; package com.mmc.oms.model.dto.repo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论