Skip to content

O
order-group
Commit e4f62a75 by hanghang.wang
Options

修改订单配送类型

parent e964f567
Showing with 361 additions and 98 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -1197,21 +1197,27 @@ public class OrderAdapter {
}
else {
responseVo.setOrderPayType(PayChannelType.WECHAT.getName());
responseVo.setOrderPayTypeDescEn(PayChannelType.WECHAT.getNameEn());
}
}
else if (ordersBean.getOrderPayItem()!=null && ordersBean.getOrderPayItem().size()>0) {
responseVo.setOrderPayType(PayChannelType.COMB.getName());
responseVo.setOrderPayTypeDescEn(PayChannelType.COMB.getNameEn());
}
else {
if (OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())) {
responseVo.setOrderPayType("支付宝支付");
}
else if(OrderSourceType.SAAS.getCode().equals(ordersBean.getSource())) {
responseVo.setOrderPayType("微信支付");
}
else {
responseVo.setOrderPayTypeDescEn(PayChannelType.ALIPAY.getNameEn());
}else{
responseVo.setOrderPayType("微信支付");
responseVo.setOrderPayTypeDescEn(PayChannelType.WECHAT.getNameEn());
}
// else if(OrderSourceType.SAAS.getCode().equals(ordersBean.getSource())) {
// responseVo.setOrderPayType("微信支付");
// }
// else {
// responseVo.setOrderPayType("微信支付");
// }
}
......@@ -1275,6 +1281,7 @@ public class OrderAdapter {
responseVo.setOrderType(ordersBean.getType());
if (IappIdType.WC_XCX.getCode().equals(iAppId)) {
responseVo.setOrderTypeDesc("围餐");
responseVo.setOrderTypeDescEn("Round the table");
}else {
responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getType()))
.map(OrderTypeGather::getDesc).orElse(""));
......@@ -1285,7 +1292,6 @@ public class OrderAdapter {
}
if (ordersBean.getHasRefund() != null && ordersBean.getHasRefund() && CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
QueryOrdersResponse.DataBean.OrderBean.RefundBean latestRefundBean = ordersBean.getRefundList().get(0);
for(int i=0;i<ordersBean.getRefundList().size();i++) {
QueryOrdersResponse.DataBean.OrderBean.RefundBean refundBean = ordersBean.getRefundList().get(i);
......@@ -1319,6 +1325,8 @@ public class OrderAdapter {
responseVo.setRefundStatus(refundBean.getStatus());
responseVo.setRefundStatusDesc(Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus()))
.map(RefundStatus::getDesc).orElse(""));
responseVo.setRefundStatusDescEn(Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus()))
.map(RefundStatus::getDescEn).orElse(""));
responseVo.setRefundReason(refundBean.getReason());
String refundCreateTime = DateUtil.convert2String(new Date(Long.parseLong(refundBean.getCreateTime())),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
responseVo.setRefundCreateTime(refundCreateTime);
......@@ -1687,7 +1695,7 @@ public class OrderAdapter {
orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE_MAKE.getCode());
orderViewStatusDto.setOrderStatusDesc("待取餐");
//制作完成 中文返回待取餐 英文反回制作完成
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.COMPLETE_MAKE.getDescEn());
orderViewStatusDto.setOrderStatusDescEn("Goods to be collected");
orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
......@@ -1755,7 +1763,8 @@ public class OrderAdapter {
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
orderViewStatusDto.setOrderStatusDesc(OrderStatus.RECEIPT.getDescEn());
//制作中
orderViewStatusDto.setOrderStatusDesc("In production");
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
......@@ -1783,7 +1792,7 @@ public class OrderAdapter {
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonContactPartner(true);
}
orderViewStatusDto.setOrderStatusDesc(OrderStatus.COMPLETE_MAKE.getDescEn());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.DISTRIBUTION.getDescEn());
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
......@@ -1811,7 +1820,7 @@ public class OrderAdapter {
|| DeliverStatus.DELIVERYCOLLECT.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderViewStatus.RIDERDELIVERY.getCode());
orderViewStatusDto.setOrderStatusDesc("骑手取餐中");
orderViewStatusDto.setOrderStatusDescEn("rider delivery");
orderViewStatusDto.setOrderStatusDescEn("Rider goes to collect goods");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonRefund(true);
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1821,8 +1830,8 @@ public class OrderAdapter {
|| DeliverStatus.DELIVERYERROR.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVERYCANCEL.getCode().equals(orderBean.getDeliverStatus())){
orderViewStatusDto.setOrderStatus(OrderViewStatus.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("配送中");
orderViewStatusDto.setOrderStatusDescEn("deliver");
orderViewStatusDto.setOrderStatusDesc(OrderStatus.DISTRIBUTION.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.DISTRIBUTION.getDescEn());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactRider(true);
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1836,8 +1845,8 @@ public class OrderAdapter {
/**由于下方部分状态描述未找到枚举类，直接赋值英文字段**/
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescEn("refunded");
orderViewStatusDto.setOrderStatusDesc(PayStatus.HAVE_REFUND.getDesc());
orderViewStatusDto.setOrderStatusDescEn(PayStatus.HAVE_REFUND.getDescEn());
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1845,15 +1854,15 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescEn("A refund of");
orderViewStatusDto.setOrderStatusDescEn("Refund in progress");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("正在退款中，请稍等");
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatus.REFUSE.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescEn("already refund");
orderViewStatusDto.setOrderStatusDesc(PayStatus.HAVE_REFUND.getDesc());
orderViewStatusDto.setOrderStatusDescEn(PayStatus.HAVE_REFUND.getDescEn());
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1877,7 +1886,7 @@ public class OrderAdapter {
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
}
orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE.getCode());
orderViewStatusDto.setOrderStatusDesc("已完成");
orderViewStatusDto.setOrderStatusDesc(OrderStatus.COMPLETE.getDescEn());
orderViewStatusDto.setOrderStatusDesc(OrderStatus.COMPLETE.getDescEn());
orderViewStatusDto.setOrderStatusDescText("订单已完成，记得来评价一下哦~");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -2400,7 +2409,7 @@ public class OrderAdapter {
public void setApplyRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
orderViewStatusDto.setOrderStatus(orderBean.getStatus());
orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescEn("A refund of");
orderViewStatusDto.setOrderStatusDescEn("Refund in progress");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -2410,7 +2419,7 @@ public class OrderAdapter {
public void setAgreeRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
orderViewStatusDto.setOrderStatus(orderBean.getStatus());
orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescEn("A refund of");
orderViewStatusDto.setOrderStatusDescEn("Refund in progress");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
orderViewStatusDto.setButtonContactPartner(true);
......
order-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java 0 → 100644
package cn.freemud.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Retention(RetentionPolicy.RUNTIME)
public @interface IsConvertEN {
//此字段用于区分具体服务。
//区分服务之后寻找对应服务的返回code枚举类
String service() default "";
}
order-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java 0 → 100644
package cn.freemud.aop;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.enums.ResponseResult;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogParams;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.service.EmailAlertService;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.*;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.Ordered;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.util.*;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Aspect
@Component
@Slf4j
public class IsConvertEnAspect implements Ordered {
@Pointcut("@annotation(cn.freemud.annotations.IsConvertEN)")
public void pointcut() {
}
@Around("pointcut()")
public Object convertMessage(ProceedingJoinPoint joinPoint) throws Throwable {
HttpServletRequest request = currentRequest();
String language = request.getHeader("lang");
BaseResponse baseResponse = (BaseResponse) joinPoint.proceed();
//表示返回英文提示
if ("en-US".equals(language)) {
/**此处注释**/
String enMessage = ResponseResult.getResponseResult(baseResponse.getCode()).getEnMessage();
if (!StringUtils.isEmpty(enMessage)) {
baseResponse.setMessage(enMessage);
}
}
return baseResponse;
}
private HttpServletRequest currentRequest() {
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return Optional.ofNullable(servletRequestAttributes).map(ServletRequestAttributes::getRequest).orElse(null);
}
/**
* 备用方法，避免code或者message信息不统一
* 过滤返参code是否在excludeStatusCodes存在
*
* @param excludeStatusCodes
* @param statusCodeValue
* @return
*/
private boolean containStatusCode(String[] excludeStatusCodes, String statusCodeValue) {
if (excludeStatusCodes == null || excludeStatusCodes.length == 0) {
return false;
}
for (int i = 0; i < excludeStatusCodes.length; i++) {
if (excludeStatusCodes[i].equals(statusCodeValue)) {
return true;
}
}
return false;
}
@Override
public int getOrder() {
return 0;
}
}
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
......@@ -12,6 +12,7 @@
*/
package cn.freemud.controller;
import cn.freemud.annotations.IsConvertEN;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
......@@ -68,6 +69,7 @@ public class OrderController {
/**
* 创建订单
*/
@IsConvertEN
@ApiAnnotation(logMessage = "createOrder")
@PostMapping("/createOrder")
public BaseResponse createOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
......@@ -160,6 +162,7 @@ public class OrderController {
* @param queryOrderVo
* @return
*/
@IsConvertEN
@ApiAnnotation(logMessage = "previewOrderInfo")
@PostMapping("/previewOrderInfo")
public BaseResponse previewOrderInfo(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
......@@ -176,6 +179,7 @@ public class OrderController {
* @param queryOrderVo
* @return
*/
@IsConvertEN
@ApiAnnotation(logMessage = "previewOrderInfoSvcCheck")
@PostMapping("/previewOrderInfoSvcCheck")
public BaseResponse previewOrderInfoSvcCheck(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
......@@ -296,6 +300,7 @@ public class OrderController {
/**
* 查询桌号是否开台
*/
@IsConvertEN
@ApiAnnotation(logMessage = "queryTableNumberStatus")
@ApiOperation(value = "查询桌号是否开台", notes = "查询桌号是否开台", produces = "application/json")
@PostMapping("/queryTableNumberStatus")
......
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
......@@ -139,6 +139,10 @@ public class QueryOrderResponseVo {
*/
private String orderTypeDesc;
/**
* 订单类型描述
*/
private String orderTypeDescEn;
/**
* 订单状态 enum OrderStatus ,DeliverStatus=42 骑手取餐中
*/
private Integer orderStatus;
......@@ -211,6 +215,11 @@ public class QueryOrderResponseVo {
* 付款方式 微信支付
*/
private String orderPayType;
/**
* 付款方式 微信支付
*/
private String orderPayTypeDescEn;
/**
* 收货地址id
*/
......@@ -241,6 +250,11 @@ public class QueryOrderResponseVo {
private String refundStatusDesc;
/**
* 退款状态描述
*/
private String refundStatusDescEn;
/**
* 退款原因
*/
private String refundReason;
......
order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
......@@ -14,14 +14,14 @@ package cn.freemud.enums;
public enum OrderStatus {
TAKE_ORDER(1, "下单","take order"),
WAIT_PAY(2, "待支付","wait pay"),
RECEIPT(3, "接单","receipt order"),
DISTRIBUTION(4, "配送中","deliver"),
COMPLETE(5, "完成","complete"),
CALCEL(6, "取消","cancel"),
REFUSE(7,"拒单","refuse order"),
COMPLETE_MAKE(31, "制作完成","complete make");
TAKE_ORDER(1, "下单","place an order"),
WAIT_PAY(2, "待支付","To be paid"),
RECEIPT(3, "接单","Receiving orders"),
DISTRIBUTION(4, "配送中","In delivery"),
COMPLETE(5, "完成","Complete"),
CALCEL(6, "取消","Cancel"),
REFUSE(7,"拒单","Refuse to accept orders"),
COMPLETE_MAKE(31, "制作完成","Production completed");
private Integer code;
private String desc;
......
order-application-service/src/main/java/cn/freemud/enums/PayStatus.java
......@@ -14,11 +14,11 @@ package cn.freemud.enums;
public enum PayStatus {
NOT_PAY(1, "未支付","not pay"),
HAVE_PAID(2, "已支付","have paid"),
HAVE_REFUND(3, "已退款","have refund"),
HAVE_PART_REFUND(4, "已经部分退款","have part refund"),
COMPLETE(5, "完成","complete");
NOT_PAY(1, "未支付","Unpaid"),
HAVE_PAID(2, "已支付","Paid"),
HAVE_REFUND(3, "已退款","Refunded"),
HAVE_PART_REFUND(4, "已经部分退款","Partial refund"),
COMPLETE(5, "完成","Complete");
private Integer code;
......
order-application-service/src/main/java/cn/freemud/enums/RefundStatus.java
......@@ -14,7 +14,7 @@ package cn.freemud.enums;
public enum RefundStatus {
APPLY_REFUND(1, "申请退款","apply for a refund"),
APPLY_REFUND(1, "申请退款","Apply for a refund"),
AGREE_REFUND(2, "同意退款","Agree to refund"),
ALREADY_REFUND(3, "已退货","Returned"),
COMPLETE_REFUND(4, "退款完成","Refund complete"),
......
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
......@@ -11,12 +11,12 @@ public enum ResponseResult {
* 通用信息返回
*/
SUCCESS("100", "ok",""),
SYSTEM_ERROR("50001", "系统内部错误",""),
SYSTEM_BUSINESS_ERROR("50002", "系统业务错误",""),
NOT_LOGIN("40001", "用户未登录",""),
PARAMETER_MISSING("40002", "缺少必要参数",""),
OPERATE_TOO_OFTEN("40003", "忙不过来了，请稍后再试",""),
LOGIN_STORE_ERROR("40004", "登录门店异常",""),
SYSTEM_ERROR("50001", "系统内部错误","System internal error"),
SYSTEM_BUSINESS_ERROR("50002", "系统业务错误","System business error"),
NOT_LOGIN("40001", "用户未登录","User not logged in"),
PARAMETER_MISSING("40002", "缺少必要参数","Missing required parameter"),
OPERATE_TOO_OFTEN("40003", "忙不过来了，请稍后再试","The system is busy, please try again later"),
LOGIN_STORE_ERROR("40004", "登录门店异常","Login store exception"),
/**
* 用户信息状态码
......@@ -46,18 +46,18 @@ public enum ResponseResult {
*/
STORE_IMG_NOT_FOUND("43001", "查询图片数据不存在",""),
STORE_ITEM_QUERY_ERROR("43002", "查询门店商品信息失败",""),
STORE_ITEM_NOT_FOUND("43003", "门店商品信息不存在",""),
STORE_NOT_FOUND("43004", "门店不存在",""),
STORE_ITEM_CHECK_VAILD_ERROR("43005", "门店商品校验失败",""),
STORE_ITEM_NOT_FOUND("43003", "门店商品信息不存在","Store product information does not exist"),
STORE_NOT_FOUND("43004", "门店不存在","Store does not exist"),
STORE_ITEM_CHECK_VAILD_ERROR("43005", "门店商品校验失败","Store product verification failed"),
STORE_ITEM_CHECK_INVAILD("43006", "商品无效",""),
STORE_ITEM_CHECK_DISCOUNT_CHANGE("43010", "商品限购活动已变更",""),
STORE_ITEM_CHECK_CLOSE("43007", "门店已打烊,请预约点餐",""),
STORE_ITEM_STOP_BUSINESS("43010", "门店已停业",""),
STORE_ITEM_STOP_BUSINESS("43010", "门店已停业","The store is closed"),
STORE_ITEM_NOT_DELIVERY("43008", "门店不支持外卖配送",""),
STORE_ITEM_NOT_IN_DELIVERY_LIMIT_AMOUNT("43009", "订单金额未满足门店起送费",""),
STORE_BUSINESS_HOUR_ERROR("43010", "门店营业时间错误",""),
STORE_NOT_ENABLE_COLLECT_GOODS("43011", "门店不支持到店",""),
STORE_NOT_TABLE_INFO("43012", "查询桌号失败",""),
STORE_NOT_TABLE_INFO("43012", "查询桌号失败","Failed to query table number"),
STORE_DISCONTENT_DELIVERY_FEE("43013", "不满足起送金额",""),
STORE_BIND_MALL_NOT_FOUND("43014", "商城门店存在",""),
STORE_DISCONTENT_DELIVERY_CONDITION("43015", "门店起送条件设置错误",""),
......@@ -73,9 +73,9 @@ public enum ResponseResult {
/**
* 购物车状态码
*/
SHOPPING_CART_GETINFO_ERROR("44001", "查询购物车信息失败",""),
SHOPPING_CART_GETINFO_INVAILD("44002", "购物车信息不存在",""),
SHOPPING_CART_ADD_ERROR("44003", "添加购物车失败",""),
SHOPPING_CART_GETINFO_ERROR("44001", "查询购物车信息失败","Failed to query shopping cart information"),
SHOPPING_CART_GETINFO_INVAILD("44002", "购物车信息不存在","Shopping cart information does not exist"),
SHOPPING_CART_ADD_ERROR("44003", "添加购物车失败","Failed to add shopping cart"),
SHOPPING_CART_ADD_INVAILD("44004", "购物车商品不能为空",""),
SHOPPING_CART_UPDATE_ERROR("44005", "更新购物车失败",""),
SHOPPING_CART_CLEAR_ERROR("44006", "清空购车失败",""),
......@@ -92,11 +92,11 @@ public enum ResponseResult {
*/
ORDER_CREATE_ERROR("45001", "订单创建失败",""),
ORDER_PAYACCESS_ERROR("45002", "订单支付成功确认失败",""),
ORDER_QUERYORDER_ERROR("45003", "查询订单失败",""),
ORDER_QUERYORDER_ERROR("45003", "查询订单失败","Order query failed"),
ORDER_DELETE_ERROR("45004", "删除订单失败",""),
ORDER__ERRORREFUND("45005", "订单申请退款失败",""),
ORDER_PAY_GETPRE_MESSAGE_ERROR("45006", "获取预支付信息失败",""),
ORDER_EDIT_ERROR("45007", "修改订单错误",""),
ORDER_PAY_GETPRE_MESSAGE_ERROR("45006", "获取预支付信息失败","Failed to get advance payment information"),
ORDER_EDIT_ERROR("45007", "修改订单错误","Error modifying order"),
ORDER_COPY_ERROR("45008", "订单复制失败",""),
ORDER_CANCEL_ERROR("45009", "取消订单失败",""),
ORDER_QUERY_QUEUE_INDEX_ERROR("45010", "查询订单排队号失败",""),
......@@ -115,32 +115,32 @@ public enum ResponseResult {
ORDER_HAD_EVALUATE("45023","订单已评价",""),
ENCIRCLEORDER_TABLENUMBER_LOCK_ERROR("45025","调用基础服务清台失败",""),
ENCIRCLEORDER_TABLENUMBER_LOCK_USERINFO_ERROR("45026","开台获取用户信息失败",""),
ENCIRCLEORDER_TABLENUMBER_LOCK_FAILED("45027","开台失败",""),
ENCIRCLEORDER_PRE_PAYMENT_LOCK("45028","你的订单正在下单支付,无需再支付,请查看",""),
ENCIRCLEORDER_TABLENUMBER_LOCK_FAILED("45027","开台失败","Table Opening failed"),
ENCIRCLEORDER_PRE_PAYMENT_LOCK("45028","你的订单正在下单支付,无需再支付,请查看","Your order is being placed for payment. No further payment is required. Please check"),
//ENCIRCLEORDER_PRE_PAYMENT_SUCCESS("45028","订单已支付",""),
ENCIRCLEORDER_PRE_PAYMENT_CLOSE_FAILED("45029","关闭预支付订单失败",""),
ENCIRCLEORDER_UPDATE_ORDER_LOCK("45030","有小伙伴正在下单，请稍后下单",""),
ENCIRCLEORDER_UPDATE_ORDER_LOCK("45030","有小伙伴正在下单，请稍后下单","There is a small partner placing an order, please place an order later"),
ORDER_COMPAR_PRODUCTS_CHANGE("45031", "订单价格变动,总金额:￥ ",""),
CALL_STORE_CHANGE_TABLENUMBER_ERROR("45032","调用门店服务修改桌号状态失败",""),
QUERY_STORE_TABLEWARE_ERROR("45033","查询门店服务餐具错误",""),
CREATE_GROUP_ORDER_ERROR_START("45034","围餐开台创建订单失败",""),
ORDER_CREATE_OPERATION_ERROR("45035","操作类型未定义",""),
ORDER_INFO_NOT_WEIGHT_ERROR("45036","订单中包含未称重商品",""),
CALL_STORE_CHANGE_TABLENUMBER_ERROR("45032","调用门店服务修改桌号状态失败","Failed to call store service to modify table number status"),
QUERY_STORE_TABLEWARE_ERROR("45033","查询门店服务餐具错误","Query store service error"),
CREATE_GROUP_ORDER_ERROR_START("45034","围餐开台创建订单失败","Failed to create order for round table opening"),
ORDER_CREATE_OPERATION_ERROR("45035","操作类型未定义","The operation type is undefined"),
ORDER_INFO_NOT_WEIGHT_ERROR("45036","订单中包含未称重商品","The order contains unweighted items"),
ORDER_CODE_EMPTY("45037","订单号不能传空",""),
CREATE_ORDER_CHECK_SESSION_ERROR("45037","sessionId 不能为空",""),
CREATE_ORDER_CHECK_STORE_ERROR("45038","门店ID 不能为空",""),
CREATE_ORDER_CHECK_ORDERTYPE_ERROR("45039","下单类型不能为空",""),
ORDER_PRE_PAYMENT_LOCK("45040","订单正在支付",""),
ORDER_PRE_PAYMENT_LOCK("45040","订单正在支付","The order is being paid"),
ORDER_NOT_ALLOW_REFUND("45100", "退款失败，请和店员伙伴约定线下退款",""),
QUERY_TABLESTATUS_ACTIVEFLAG_ERROR("45041","桌号禁用",""),
PREVIEWORDER_UPDATE_ORDERPRICE_ERROR("45042","修改订单失败",""),
UPDATE_ORDER_INFO_ERROR("45043","下单失败",""),
CLEAR_SHOPPING_INFO_ERROR("45044","操作购物车失败",""),
ORDER_CREATE_TABLE_ERROR("45046","开台异常",""),
ORDER_TABLE_BINDING_ERROR("45047","用户未绑定桌号",""),//改code与前端有强关联，不可重复
ENCIRCLEORDER_TABLENUMBER_LOCK("45048","当前桌号正在开台或已开台",""),
ENCIRCLEORDER_PRE_PAYMENT_SUCCESS("45049","订单已支付",""),
CLEAR_SHOPPING_INFO_SYSTEM_ERROR("45048","清空购物车异常",""),
QUERY_TABLESTATUS_ACTIVEFLAG_ERROR("45041","桌号禁用","Table number forbidden"),
PREVIEWORDER_UPDATE_ORDERPRICE_ERROR("45042","修改订单失败","Failed to modify order"),
UPDATE_ORDER_INFO_ERROR("45043","下单失败","Order failed"),
CLEAR_SHOPPING_INFO_ERROR("45044","操作购物车失败","Failed to operate shopping cart"),
ORDER_CREATE_TABLE_ERROR("45046","开台异常","Abnormal opening"),
ORDER_TABLE_BINDING_ERROR("45047","用户未绑定桌号","The user is not bound with the table number"),//改code与前端有强关联，不可重复
ENCIRCLEORDER_TABLENUMBER_LOCK("45048","当前桌号正在开台或已开台","The current table number is being opened or has been opened"),
ENCIRCLEORDER_PRE_PAYMENT_SUCCESS("45049","订单已支付","Order paid"),
CLEAR_SHOPPING_INFO_SYSTEM_ERROR("45048","清空购物车异常","Empty shopping cart abnormal"),
ORDER_PARTNER_ID_NOT_MATCTH("45050","商户不匹配",""),
ORDER_STORE_ID_NOT_MATCTH("45051","门店不匹配",""),
ORDER_REPEAT_DO_COMPLETE("45052", "重复操作，订单已经完成",""),
......@@ -149,7 +149,7 @@ public enum ResponseResult {
AFFIRM_ORDER_FAIL("45055", "确认订单失败",""),
ORDER_EMPTY_CREATE_PREPAY_FAIL("45056", "订单为空，创建预订单失败",""),
ORDER_HAS_PAID("45057", "订单已支付或已完成",""),
ORDER_PRE_PAYMENT_CLOSE_FAILED("45058","关闭预支付订单失败",""),
ORDER_PRE_PAYMENT_CLOSE_FAILED("45058","关闭预支付订单失败","Failed to close prepayment order"),
ORDER_OWNER_ERROR("45059","订单归属错误",""),
ORDER_STATUS_PRE_PAYMENT_NOT_SUPPORT("45060", "订单非待支付状态, 创建预支付失败",""),
ORDER_TAKEMEALTIME_INVALID("45061", "你的隔日预约时间有误，请重新刷新后选择！",""),
......@@ -177,7 +177,7 @@ public enum ResponseResult {
/**
* 支付
*/
PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常",""),
PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常","Abnormal payment transaction"),
/**
* 优惠券活动
*/
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java
......@@ -7,17 +7,18 @@ import lombok.Getter;
@AllArgsConstructor
public enum PayChannelType {
WECHAT((byte)1,"10211","微信"),
ALIPAY((byte)2,"10300","支付宝"),
SVC((byte)3,"10102","储值卡"),
COMB((byte)4,"10212","混合支付"),
USVCP((byte)5,"10556", "电子风味卡支付"),
ZERO((byte)6,"100000", "0元支付"),
TIKTOKPAY((byte)7,"10066", "抖音支付");
WECHAT((byte)1,"10211","微信","wechat"),
ALIPAY((byte)2,"10300","支付宝","alipay"),
SVC((byte)3,"10102","储值卡","svc"),
COMB((byte)4,"10212","混合支付","comb"),
USVCP((byte)5,"10556", "电子风味卡支付","usvcp"),
ZERO((byte)6,"100000", "0元支付","zero"),
TIKTOKPAY((byte)7,"10066", "抖音支付","tiktokpay");
private Byte index;
private String ebcode;
private String name;
private String nameEn;
public static final String API_DESC = "订单支付渠道类型 1:微信 2:储值卡 3:支付宝 4:混合支付,5:电子风味卡支付";
......
shopping-cart-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java 0 → 100644
package cn.freemud.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Retention(RetentionPolicy.RUNTIME)
public @interface IsConvertEN {
//传入服务名，用于区分枚举类
String service() default "";
}
shopping-cart-application-service/src/main/java/cn/freemud/aop/LogIgnore.java → shopping-cart-application-service/src/main/java/cn/freemud/annotations/LogIgnore.java
package cn.freemud.aop;
package cn.freemud.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* @author
* @author wanghanghang
*/
@Retention(RetentionPolicy.RUNTIME)
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/ControllerLogAop.java
package cn.freemud.aop;
import cn.freemud.annotations.LogIgnore;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation;
......@@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
......@@ -53,7 +53,7 @@ public class ControllerLogAop implements Ordered {
@Value("${exclude-print-body-log-methods:findNearPickUpStores,getMenuCategory}")
private volatile List<String> excludePrintBodyLogMethods = Lists.newArrayList();
@Pointcut("@annotation(cn.freemud.aop.LogIgnore)")
@Pointcut("@annotation(cn.freemud.annotations.LogIgnore)")
public void pointcut() {
}
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java 0 → 100644
package cn.freemud.aop;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.enums.ResponseResult;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.core.Ordered;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.Optional;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Aspect
@Component
@Slf4j
public class IsConvertEnAspect implements Ordered {
@Pointcut("@annotation(cn.freemud.annotations.IsConvertEN)")
public void pointcut() {
}
@Around("pointcut()")
public Object convertMessage(ProceedingJoinPoint joinPoint) throws Throwable {
HttpServletRequest request = currentRequest();
String language = request.getHeader("lang");
BaseResponse baseResponse = (BaseResponse) joinPoint.proceed();
//表示返回英文提示 本次变更3个提示 手动直接转换
if ("en-US".equals(language)) {
switch (baseResponse.getCode()) {
case "44013":
//购物车商品有变动，请手动刷新再修改
baseResponse.setMessage("Shopping cart items have changed, please refresh and modify manually");
break;
case "44014":
//没有绑定桌号，无法加入购物车
baseResponse.setMessage("There is no binding table number, unable to join the shopping cart");
break;
case "44003":
//添加购物车失败
baseResponse.setMessage("Failed to add shopping cart");
break;
case "43005":
//门店商品校验失败
baseResponse.setMessage("Store product verification failed");
break;
case "43003":
//门店商品信息不存在
baseResponse.setMessage("Store product information does not exist");
break;
}
}
return baseResponse;
}
private HttpServletRequest currentRequest() {
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return Optional.ofNullable(servletRequestAttributes).map(ServletRequestAttributes::getRequest).orElse(null);
}
/**
* 备用方法，避免code或者message信息不统一
* 过滤返参code是否在excludeStatusCodes存在
*
* @param excludeStatusCodes
* @param statusCodeValue
* @return
*/
private boolean containStatusCode(String[] excludeStatusCodes, String statusCodeValue) {
if (excludeStatusCodes == null || excludeStatusCodes.length == 0) {
return false;
}
for (int i = 0; i < excludeStatusCodes.length; i++) {
if (excludeStatusCodes[i].equals(statusCodeValue)) {
return true;
}
}
return false;
}
@Override
public int getOrder() {
return 0;
}
}
shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
package cn.freemud.aop;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.CommonRedisKeyConstant;
import cn.freemud.entities.vo.ThirdPartLogVo;
import cn.freemud.enums.CommonResponseResult;
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
......@@ -12,12 +12,11 @@
*/
package cn.freemud.controller;
import cn.freemud.aop.LogIgnore;
import cn.freemud.annotations.LogIgnore;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.vo.*;
import cn.freemud.enums.ResponseResult;
import cn.freemud.service.impl.ShoppingCartCollageServiceImpl;
import cn.freemud.service.impl.ShoppingCartMallServiceImpl;
import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ApiAnnotation;
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
......@@ -12,7 +12,8 @@
*/
package cn.freemud.controller;
import cn.freemud.aop.LogIgnore;
import cn.freemud.annotations.IsConvertEN;
import cn.freemud.annotations.LogIgnore;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.GetMemberInfoRequestDto;
......@@ -67,6 +68,7 @@ public class ShoppingCartController {
/**
* 向购物车中添加商品
*/
@IsConvertEN
@PostMapping(value = "/addGoods")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "addGoods")
public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
......@@ -76,6 +78,7 @@ public class ShoppingCartController {
/**
* 修改购物车中商品数量
*/
@IsConvertEN
@PostMapping(value = "/updateGoodsQty")
@LogIgnore(logMessage = "updateGoodsQty")
public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
......@@ -85,6 +88,7 @@ public class ShoppingCartController {
/**
* 查询购物车信息
*/
@IsConvertEN
@PostMapping(value = "/listCartGoods")
@LogIgnore(logMessage = "listCartGoods")
public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
......@@ -112,6 +116,7 @@ public class ShoppingCartController {
/**
* 清空购物车
*/
@IsConvertEN
@PostMapping(value = "/clearCartGoods")
@LogIgnore(logMessage = "clearCartGoods")
public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
......@@ -133,6 +138,7 @@ public class ShoppingCartController {
* @param getShoppingCartGoodsApportionRequestVo
* @return
*/
@IsConvertEN
@PostMapping(value = "/getShoppingCartGoodsApportion")
@LogIgnore(logMessage = "getShoppingCartGoodsApportion")
public BaseResponse getShoppingCartGoodsApportion(@Validated @LogParams @RequestBody GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo) {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
......@@ -12,13 +12,11 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
import com.freemud.application.sdk.api.base.BaseResponse;
import com.freemud.application.sdk.api.promotioncenter.response.CalculationDiscountResponseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/BigDataFeiginClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.BuryingPointBigDto;
import cn.freemud.entities.dto.BuryingPointResDto;
import org.springframework.cloud.openfeign.FeignClient;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CalculationClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.calculate.CalculationSharingDiscountRequestDto;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CardBinClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.GetPaidRuleRequestDto;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StockClient.java
......@@ -12,7 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StoreItemClient.java
......@@ -12,7 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.*;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment