Merge branch 'feature/20210226_【C端服务端】订单状态新增英文字段_wanghanghang'

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1202,6 +1202,9 @@ public class OrderAdapter {
             responseVo.setPayStatus(ordersBean.getPayStatus());
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
+            responseVo.setPayStatusDescEn(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
+                    .map(PayStatus::getDescEn).orElse(""));
+
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
             if(mcCafePartnerId.equals(ordersBean.getCompanyId()) && StringUtils.isNotBlank(responseVo.getPayVoucher())) {
                 responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
@@ -1213,24 +1216,31 @@ public class OrderAdapter {
                 PayChannelType ebcode = PayChannelType.getByEbcode(ordersBean.getPayChannel());
                 if (ebcode!=null) {
                     responseVo.setOrderPayType(ebcode.getName());
+                    responseVo.setOrderPayTypeDescEn(ebcode.getNameEn());
                 }
                 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("微信支付");
+//                }
             }
 
 
@@ -1249,6 +1259,7 @@ public class OrderAdapter {
             ArrayList<QueryOrderResponseVo.OrderStatusFlow> orderChangeTime = getOrderTimeDesc(ordersBean);
             responseVo.setOrderStatusFlows(orderChangeTime);
             responseVo.setOrderStatusDesc(orderViewStatusDto.getOrderStatusDesc());
+            responseVo.setOrderStatusDescEn(orderViewStatusDto.getOrderStatusDescEn());
             responseVo.setOrderStatusDescText(orderViewStatusDto.getOrderStatusDescText());
             if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
                 responseVo.setRefundTips(orderViewStatusDto.getRefundStatusText());
@@ -1293,6 +1304,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(""));
@@ -1303,7 +1315,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);
@@ -1337,6 +1348,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);
@@ -1637,21 +1650,26 @@ public class OrderAdapter {
         orderViewStatusDto.setRiderName("");
         orderViewStatusDto.setRiderText("");
         orderViewStatusDto.setRiderPhoto("");
+        /**本次订单状态中英文翻译不考虑美业的业务**/
         if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OrderType.EAT_IN.getCode().equals(orderBean.getType())) {
             if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
                 orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode());
-                orderViewStatusDto.setOrderStatusDesc("待支付");
+                orderViewStatusDto.setOrderStatusDesc(OrderStatus.WAIT_PAY.getDesc());
+                orderViewStatusDto.setOrderStatusDescEn(OrderStatus.WAIT_PAY.getDescEn());
                 orderViewStatusDto.setOrderStatusDescText("");
             }
             if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
                 orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
-                orderViewStatusDto.setOrderStatusDesc("已取消");
+                orderViewStatusDto.setOrderStatusDesc(OrderStatus.CALCEL.getDesc());
+                orderViewStatusDto.setOrderStatusDescEn(OrderStatus.CALCEL.getDescEn());
                 orderViewStatusDto.setOrderStatusDescText("");
             }
             if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
                     orderViewStatusDto.setOrderStatusDesc(conventCreateOrderString(orderBean));
+//                  orderViewStatusDto.setOrderStatusDesc(OrderStatus.TAKE_ORDER.getDesc());
+                    orderViewStatusDto.setOrderStatusDescEn(OrderStatus.TAKE_ORDER.getDescEn());
                     orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
                     if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
                         orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
@@ -1676,6 +1694,8 @@ public class OrderAdapter {
             if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
+//                  orderViewStatusDto.setOrderStatusDesc(OrderStatus.RECEIPT.getDesc());
+                    orderViewStatusDto.setOrderStatusDescEn(OrderStatus.RECEIPT.getDescEn());
                     orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
                     orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
                     if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
@@ -1702,6 +1722,8 @@ public class OrderAdapter {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE_MAKE.getCode());
                     orderViewStatusDto.setOrderStatusDesc("待取餐");
+                    //制作完成 中文返回待取餐  英文反回制作完成
+                    orderViewStatusDto.setOrderStatusDescEn("Goods to be collected");
                     orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
                     if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
                         orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
@@ -1720,31 +1742,26 @@ public class OrderAdapter {
         if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
                 orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode());
-                orderViewStatusDto.setOrderStatusDesc("待支付");
+                orderViewStatusDto.setOrderStatusDesc(OrderStatus.WAIT_PAY.getDesc());
+                orderViewStatusDto.setOrderStatusDescEn(OrderStatus.WAIT_PAY.getDescEn());
                 orderViewStatusDto.setOrderStatusDescText("");
             }
             if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     if (orderBean.getDeliverStatus() == null) {
-                        orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
-                        orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
-                        orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
-                        orderViewStatusDto.setButtonContactPartner(true);
-                        orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
                         orderViewStatusDto.setRiderName("商家自配送");
-                        orderViewStatusDto.setRiderText("正在为您匹配配送员");
-                        orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
                     } else {
+                        orderViewStatusDto.setRiderName("处理中");
+                    }
                     orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
                     orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
+                    orderViewStatusDto.setOrderStatusDescEn(OrderStatus.TAKE_ORDER.getDescEn());
                     orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                     orderViewStatusDto.setButtonContactPartner(true);
                     orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
-                        orderViewStatusDto.setRiderName("处理中");
                     orderViewStatusDto.setRiderText("正在为您匹配配送员");
                     orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
                 }
-                }
                 if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
                     setApplyRefundDesc(orderViewStatusDto, orderBean);
                 }
@@ -1774,6 +1791,8 @@ public class OrderAdapter {
                         orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
                         orderViewStatusDto.setButtonContactPartner(true);
                     }
+                    //制作中
+                    orderViewStatusDto.setOrderStatusDesc("In production");
                 }
                 if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
                     setApplyRefundDesc(orderViewStatusDto, orderBean);
@@ -1801,6 +1820,7 @@ public class OrderAdapter {
                         orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
                         orderViewStatusDto.setButtonContactPartner(true);
                     }
+                    orderViewStatusDto.setOrderStatusDescEn(OrderStatus.DISTRIBUTION.getDescEn());
                 }
                 if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
                     setApplyRefundDesc(orderViewStatusDto, orderBean);
@@ -1814,7 +1834,8 @@ public class OrderAdapter {
                 if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus())
                         || DeliverStatus.DELIVER_OTHER.getCode().equals(orderBean.getDeliverStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.DISTRIBUTION.getCode());
-                    orderViewStatusDto.setOrderStatusDesc("配送中");
+                    orderViewStatusDto.setOrderStatusDesc(OrderStatus.DISTRIBUTION.getDesc());
+                    orderViewStatusDto.setOrderStatusDescEn(OrderStatus.DISTRIBUTION.getDescEn());
                     orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                     orderViewStatusDto.setButtonContactPartner(true);
                     orderViewStatusDto.setRiderName("商家自配送");
@@ -1827,6 +1848,7 @@ public class OrderAdapter {
                             || DeliverStatus.DELIVERYCOLLECT.getCode().equals(orderBean.getDeliverStatus())) {
                         orderViewStatusDto.setOrderStatus(OrderViewStatus.RIDERDELIVERY.getCode());
                         orderViewStatusDto.setOrderStatusDesc("骑手取餐中");
+                        orderViewStatusDto.setOrderStatusDescEn("Rider goes to collect goods");
                         orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                         orderViewStatusDto.setButtonRefund(true);
                         orderViewStatusDto.setButtonContactPartner(true);
@@ -1836,7 +1858,8 @@ public class OrderAdapter {
                             || DeliverStatus.DELIVERYERROR.getCode().equals(orderBean.getDeliverStatus())
                             || DeliverStatus.DELIVERYCANCEL.getCode().equals(orderBean.getDeliverStatus())){
                         orderViewStatusDto.setOrderStatus(OrderViewStatus.DISTRIBUTION.getCode());
-                        orderViewStatusDto.setOrderStatusDesc("配送中");
+                        orderViewStatusDto.setOrderStatusDesc(OrderStatus.DISTRIBUTION.getDesc());
+                        orderViewStatusDto.setOrderStatusDescEn(OrderStatus.DISTRIBUTION.getDescEn());
                         orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                         orderViewStatusDto.setButtonContactRider(true);
                         orderViewStatusDto.setButtonContactPartner(true);
@@ -1847,9 +1870,11 @@ public class OrderAdapter {
                 }
             }
         }
+        /**由于下方部分状态描述未找到枚举类，直接赋值英文字段**/
         if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
-            orderViewStatusDto.setOrderStatusDesc("已退款");
+            orderViewStatusDto.setOrderStatusDesc(PayStatus.HAVE_REFUND.getDesc());
+            orderViewStatusDto.setOrderStatusDescEn(PayStatus.HAVE_REFUND.getDescEn());
             orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
             orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
             orderViewStatusDto.setButtonContactPartner(true);
@@ -1857,20 +1882,23 @@ public class OrderAdapter {
         if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
             orderViewStatusDto.setOrderStatusDesc("退款中");
+            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.setOrderStatusDesc(PayStatus.HAVE_REFUND.getDesc());
+            orderViewStatusDto.setOrderStatusDescEn(PayStatus.HAVE_REFUND.getDescEn());
             orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
             orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
             orderViewStatusDto.setButtonContactPartner(true);
         }
         if (PayStatus.HAVE_REFUND.getCode().equals(orderBean.getPayStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
-            orderViewStatusDto.setOrderStatusDesc("已退款");
+            orderViewStatusDto.setOrderStatusDesc(PayStatus.HAVE_REFUND.getDesc());
+            orderViewStatusDto.setOrderStatusDescEn(PayStatus.HAVE_REFUND.getDescEn());
             orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
             orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
             orderViewStatusDto.setButtonContactPartner(true);
@@ -1886,7 +1914,8 @@ public class OrderAdapter {
                 orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
             }
             orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE.getCode());
-            orderViewStatusDto.setOrderStatusDesc("已完成");
+            orderViewStatusDto.setOrderStatusDesc(OrderStatus.COMPLETE.getDesc());
+            orderViewStatusDto.setOrderStatusDescEn(OrderStatus.COMPLETE.getDescEn());
             orderViewStatusDto.setOrderStatusDescText("订单已完成，记得来评价一下哦~");
             orderViewStatusDto.setButtonContactPartner(true);
             orderViewStatusDto.setButtonEvaluate(true);
@@ -2407,6 +2436,7 @@ public class OrderAdapter {
     public void setApplyRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         orderViewStatusDto.setOrderStatus(orderBean.getStatus());
         orderViewStatusDto.setOrderStatusDesc("退款中");
+        orderViewStatusDto.setOrderStatusDescEn("Refund in progress");
         orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
         orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
         orderViewStatusDto.setButtonContactPartner(true);
@@ -2416,6 +2446,7 @@ public class OrderAdapter {
     public void setAgreeRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         orderViewStatusDto.setOrderStatus(orderBean.getStatus());
         orderViewStatusDto.setOrderStatusDesc("退款中");
+        orderViewStatusDto.setOrderStatusDescEn("Refund in progress");
         orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
         orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
         orderViewStatusDto.setButtonContactPartner(true);
@@ -3179,7 +3210,9 @@ public class OrderAdapter {
                 Long warePrice = tableWareProducts.stream().mapToLong(var -> var.getFinalPrice()).sum();
                 ProductVo wareProductVo = new ProductVo();
                 wareProductVo.setName("餐具");
+                wareProductVo.setForeignName("tableware");
                 wareProductVo.setSpuName("餐具");
+                wareProductVo.setSpuForeignName("tableware");
                 wareProductVo.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode());
                 wareProductVo.setQty(tableWareProducts.get(0).getQty());
                 wareProductVo.setSaleTotalAmount(warePrice * tableWareProducts.get(0).getQty());
@@ -3198,8 +3231,10 @@ public class OrderAdapter {
         previewOrderInfoVo.setDiscountTotalAmount(queryOrderResponseVo.getDiscountTotalAmount());
         previewOrderInfoVo.setOrderStatus(queryOrderResponseVo.getOrderStatus());
         previewOrderInfoVo.setOrderStatusDesc(queryOrderResponseVo.getOrderStatusDesc());
+        previewOrderInfoVo.setOrderStatusDescEn(queryOrderResponseVo.getOrderStatusDescEn());
         previewOrderInfoVo.setPayStatus(queryOrderResponseVo.getPayStatus());
         previewOrderInfoVo.setPayStatusDesc(queryOrderResponseVo.getPayStatusDesc());
+        previewOrderInfoVo.setPayStatusDescEn(queryOrderResponseVo.getPayStatusDescEn());
         previewOrderInfoVo.setShopName(queryOrderResponseVo.getShopName());
         previewOrderInfoVo.setShopNameEn(queryOrderResponseVo.getShopNameEn());
 

order-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java

+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

+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/dto/OrderViewStatusDto.java

@@ -26,6 +26,10 @@ public class OrderViewStatusDto {
      */
     private String orderStatusDesc;
     /**
+     * 订单类型描述
+     */
+    private String orderStatusDescEn;
+    /**
      * 订单类型描述文案
      */
     private String orderStatusDescText;

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -147,6 +147,10 @@ public class QueryOrderResponseVo {
      */
     private String orderTypeDesc;
     /**
+     * 订单类型描述
+     */
+    private String orderTypeDescEn;
+    /**
      * 订单状态   enum  OrderStatus ,DeliverStatus=42 骑手取餐中
      */
     private Integer orderStatus;
@@ -155,6 +159,10 @@ public class QueryOrderResponseVo {
      */
     private String orderStatusDesc;
     /**
+     * 订单状态描述
+     */
+    private String orderStatusDescEn;
+    /**
      * 订单状态显示的对应描述
      */
     private String orderStatusDescText;
@@ -209,6 +217,10 @@ public class QueryOrderResponseVo {
      */
     private String payStatusDesc;
     /**
+     * 支付状态描述英文
+     */
+    private String payStatusDescEn;
+    /**
      * 支付时间
      */
     private String payCreateTime;
@@ -216,6 +228,11 @@ public class QueryOrderResponseVo {
      * 付款方式  微信支付
      */
     private String orderPayType;
+
+    /**
+     * 付款方式  微信支付
+     */
+    private String orderPayTypeDescEn;
     /**
      * 收货地址id
      */
@@ -246,6 +263,11 @@ public class QueryOrderResponseVo {
     private String refundStatusDesc;
 
     /**
+     * 退款状态描述
+     */
+    private String refundStatusDescEn;
+
+    /**
      * 退款原因
      */
     private String refundReason;

order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java

@@ -65,6 +65,8 @@ public class PreviewOrderInfoVo {
      */
     private String orderStatusDesc;
 
+    private String orderStatusDescEn;
+
     /**
      * 支付状态  enum  PayStatus
      */
@@ -73,6 +75,10 @@ public class PreviewOrderInfoVo {
      * 支付状态描述
      */
     private String payStatusDesc;
+    /**
+     * 支付状态描述英文
+     */
+    private String payStatusDescEn;
 
     /**
      * 订单修改版本号

order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java

@@ -14,21 +14,23 @@ package cn.freemud.enums;
 
 public enum OrderStatus {
 
-    TAKE_ORDER(1, "下单"),
-    WAIT_PAY(2, "待支付"),
-    RECEIPT(3, "接单"),
-    DISTRIBUTION(4, "配送中"),
-    COMPLETE(5, "完成"),
-    CALCEL(6, "取消"),
-    REFUSE(7,"拒单"),
-    COMPLETE_MAKE(31, "制作完成");
+    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;
+    private String descEn;
 
-    OrderStatus(Integer code, String desc) {
+    OrderStatus(Integer code, String desc,String descEn) {
         this.code = code;
         this.desc = desc;
+        this.descEn = descEn;
     }
 
     public static Integer[] getAllCodes() {
@@ -53,6 +55,14 @@ public enum OrderStatus {
         return null;
     }
 
+    public String getDescEn() {
+        return descEn;
+    }
+
+    public void setDescEn(String descEn) {
+        this.descEn = descEn;
+    }
+
     public Integer getCode() {
         return code;
     }

order-application-service/src/main/java/cn/freemud/enums/PayStatus.java

@@ -14,19 +14,21 @@ package cn.freemud.enums;
 
 public enum PayStatus {
 
-    NOT_PAY(1, "未支付"),
-    HAVE_PAID(2, "已支付"),
-    HAVE_REFUND(3, "已退款"),
-    HAVE_PART_REFUND(4, "已经部分退款"),
-    COMPLETE(5, "完成");
+    NOT_PAY(1, "未支付","Unpaid"),
+    HAVE_PAID(2, "已支付","Paid"),
+    HAVE_REFUND(3, "已退款","Refunded"),
+    HAVE_PART_REFUND(4, "已经部分退款","Partial refund"),
+    COMPLETE(5, "完成","Complete");
 
 
     private Integer code;
     private String desc;
+    private String descEn;
 
-    PayStatus(Integer code, String desc) {
+    PayStatus(Integer code, String desc,String descEn) {
         this.code = code;
         this.desc = desc;
+        this.descEn = descEn;
     }
 
     public static PayStatus getByCode(Integer code) {
@@ -56,4 +58,12 @@ public enum PayStatus {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public String getDescEn() {
+        return descEn;
+    }
+
+    public void setDescEn(String descEn) {
+        this.descEn = descEn;
+    }
 }

order-application-service/src/main/java/cn/freemud/enums/RefundStatus.java

@@ -14,19 +14,23 @@ package cn.freemud.enums;
 
 public enum RefundStatus {
 
-    APPLY_REFUND(1, "申请退款"),
-    AGREE_REFUND(2, "同意退款"),
-    ALREADY_REFUND(3, "已退货"),
-    COMPLETE_REFUND(4, "退款完成"),
-    REFUSE_REFUND(5, "拒绝退款");
-
+    APPLY_REFUND(1, "申请退款","Apply for a refund"),
+    AGREE_REFUND(2, "同意退款","Agree to refund"),
+    ALREADY_REFUND(3, "已退货","Returned"),
+    COMPLETE_REFUND(4, "退款完成","Refund complete"),
+    REFUSE_REFUND(5, "拒绝退款","Refuse refund");
 
+    /**编号**/
     private Integer code;
+    /**中文**/
     private String desc;
+    /**英文**/
+    private String descEn;
 
-    RefundStatus(Integer code, String desc) {
+    RefundStatus(Integer code, String desc, String descEn) {
         this.code = code;
         this.desc = desc;
+        this.descEn = descEn;
     }
 
     public static RefundStatus getByCode(Integer code) {
@@ -53,4 +57,12 @@ public enum RefundStatus {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public String getDescEn() {
+        return descEn;
+    }
+
+    public void setDescEn(String descEn) {
+        this.descEn = descEn;
+    }
 }

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -10,230 +10,230 @@ 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", "登录门店异常"),
+    SUCCESS("100", "ok",""),
+    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"),
 
     /**
      * 用户信息状态码
      */
-    SESSION_INVAILD("41000", "用户sessionId已过期"),
-    USER_GETPHONE_ERROR("41002", "获取用户手机号失败"),
-    USER_SIGNATURE_ERROR("41003", "签名信息错误"),
-    USER_REGISTER_ERROR("41004", "用户注册失败"),
-    USER_CODE_INVAILD("41005", "无效的code信息"),
-    USER_EDIT_MOBILE_ERROR("41007", "修改手机号错误"),
-    USER_GETRECEIVEADDRESS_ERROR("41008", "获取收货地址异常"),
-    USER_UPDATERECEIVEADDRESS_ERROR("41009", "修改收货地址异常"),
-    USER_ADDRECEIVEADDRESS_ERROR("41010", "新增收货地址异常"),
-    USER_DELETERECEIVEADDRESS_ERROR("41011", "删除收货地址异常"),
-    USER_SVC_CARD_ERROR("41012", "用户卡号异常"),
-    USER_SVC_CARD_AMOUNT_DEFICIENCY("41013", "储值卡余额不足"),
+    SESSION_INVAILD("41000", "用户sessionId已过期",""),
+    USER_GETPHONE_ERROR("41002", "获取用户手机号失败",""),
+    USER_SIGNATURE_ERROR("41003", "签名信息错误",""),
+    USER_REGISTER_ERROR("41004", "用户注册失败",""),
+    USER_CODE_INVAILD("41005", "无效的code信息",""),
+    USER_EDIT_MOBILE_ERROR("41007", "修改手机号错误",""),
+    USER_GETRECEIVEADDRESS_ERROR("41008", "获取收货地址异常",""),
+    USER_UPDATERECEIVEADDRESS_ERROR("41009", "修改收货地址异常",""),
+    USER_ADDRECEIVEADDRESS_ERROR("41010", "新增收货地址异常",""),
+    USER_DELETERECEIVEADDRESS_ERROR("41011", "删除收货地址异常",""),
+    USER_SVC_CARD_ERROR("41012", "用户卡号异常",""),
+    USER_SVC_CARD_AMOUNT_DEFICIENCY("41013", "储值卡余额不足",""),
 
     /**
      * 验证码 状态码
      */
-    SMSCODE_SEND_ERROR("42001", "验证码发送失败"),
-    SMSCODE_EXIST("42002", "验证码已发送，请注意查收"),
-    SMSCODE_ERROR("42003", "验证码错误，请核对后重新输入"),
+    SMSCODE_SEND_ERROR("42001", "验证码发送失败",""),
+    SMSCODE_EXIST("42002", "验证码已发送，请注意查收",""),
+    SMSCODE_ERROR("42003", "验证码错误，请核对后重新输入",""),
 
     /**
      * 门店状态码
      */
-    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_CHECK_INVAILD("43006", "商品无效"),
-    STORE_ITEM_CHECK_DISCOUNT_CHANGE("43010", "商品限购活动已变更"),
-    STORE_ITEM_CHECK_CLOSE("43007", "门店已打烊,请预约点餐"),
-    STORE_ITEM_STOP_BUSINESS("43010", "门店已停业"),
-    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_DISCONTENT_DELIVERY_FEE("43013", "不满足起送金额"),
-    STORE_BIND_MALL_NOT_FOUND("43014", "商城门店存在"),
-    STORE_DISCONTENT_DELIVERY_CONDITION("43015", "门店起送条件设置错误"),
-    STORE_DISCONTENT_DELIVERY_CUP("43016", "不满足起送杯数"),
-    STORE_MAKE_AN_APPOINTMENT_STOP_BUSINESS("43017", "预约失败,请重新下单"),
-    STORE_MAKE_AN_APPOINTMENT_OPEN_BUSINESS("43018", "门店不支持预约,请重新选择"),
-    STORE_CLOSED_FOREVER("43017", "门店已关闭，请选择其他门店"),
-    STORE_CLOSED_THE_NIGHT("43018", "门店已打烊，请选择其他门店"),
-    STORE_DELIVERY_HOUR_ERROR("43019", "门店外卖时间错误"),
-    STORE_WILL_COLSE("43020", "门店即将打烊，不能下单"),
-    STORE_DDELIVERY_METHOD("43021", "获取门店外卖配送方式异常"),
+    STORE_IMG_NOT_FOUND("43001", "查询图片数据不存在",""),
+    STORE_ITEM_QUERY_ERROR("43002", "查询门店商品信息失败",""),
+    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", "门店已停业","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", "查询桌号失败","Failed to query table number"),
+    STORE_DISCONTENT_DELIVERY_FEE("43013", "不满足起送金额",""),
+    STORE_BIND_MALL_NOT_FOUND("43014", "商城门店存在",""),
+    STORE_DISCONTENT_DELIVERY_CONDITION("43015", "门店起送条件设置错误",""),
+    STORE_DISCONTENT_DELIVERY_CUP("43016", "不满足起送杯数",""),
+    STORE_MAKE_AN_APPOINTMENT_STOP_BUSINESS("43017", "预约失败,请重新下单",""),
+    STORE_MAKE_AN_APPOINTMENT_OPEN_BUSINESS("43018", "门店不支持预约,请重新选择",""),
+    STORE_CLOSED_FOREVER("43017", "门店已关闭，请选择其他门店",""),
+    STORE_CLOSED_THE_NIGHT("43018", "门店已打烊，请选择其他门店",""),
+    STORE_DELIVERY_HOUR_ERROR("43019", "门店外卖时间错误",""),
+    STORE_WILL_COLSE("43020", "门店即将打烊，不能下单",""),
+    STORE_DDELIVERY_METHOD("43021", "获取门店外卖配送方式异常",""),
 
     /**
      * 购物车状态码
      */
-    SHOPPING_CART_GETINFO_ERROR("44001", "查询购物车信息失败"),
-    SHOPPING_CART_GETINFO_INVAILD("44002", "购物车信息不存在"),
-    SHOPPING_CART_ADD_ERROR("44003", "添加购物车失败"),
-    SHOPPING_CART_ADD_INVAILD("44004", "购物车商品不能为空"),
-    SHOPPING_CART_UPDATE_ERROR("44005", "更新购物车失败"),
-    SHOPPING_CART_CLEAR_ERROR("44006", "清空购车失败"),
-    SHOPPING_CART_ACTIVITY_CHANGE("44007", "商品价格有变动，将按照最新活动价格计算哦"),
-    SHOPPING_CART_ACTIVITY_UNDERSTOCK("44008", "特价商品库存不足超出部分按照原价购买"),
-    SHOPPING_CART_ATTRIBUTE_NOT_EXISTS("44009", "商品属性不存在"),
-    SHOPPING_CART_COUPON_NOT_EXIST("44010", "商品券不存在"),
-    SHOPPING_CART_SENDGOODS_NOT_EXIST("44011", "加价购商品不存在"),
-    SHOPPING_CART_STOCK_NOT_HAVE("44012", "商品库存不足"),
-    SHOPPING_CART_PRODUCT_NOT_EXIST("44013", "商品不存在"),
+    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", "清空购车失败",""),
+    SHOPPING_CART_ACTIVITY_CHANGE("44007", "商品价格有变动，将按照最新活动价格计算哦",""),
+    SHOPPING_CART_ACTIVITY_UNDERSTOCK("44008", "特价商品库存不足超出部分按照原价购买",""),
+    SHOPPING_CART_ATTRIBUTE_NOT_EXISTS("44009", "商品属性不存在",""),
+    SHOPPING_CART_COUPON_NOT_EXIST("44010", "商品券不存在",""),
+    SHOPPING_CART_SENDGOODS_NOT_EXIST("44011", "加价购商品不存在",""),
+    SHOPPING_CART_STOCK_NOT_HAVE("44012", "商品库存不足",""),
+    SHOPPING_CART_PRODUCT_NOT_EXIST("44013", "商品不存在",""),
 
     /**
      * 订单状态码
      */
-    ORDER_CREATE_ERROR("45001", "订单创建失败"),
-    ORDER_PAYACCESS_ERROR("45002", "订单支付成功确认失败"),
-    ORDER_QUERYORDER_ERROR("45003", "查询订单失败"),
-    ORDER_DELETE_ERROR("45004", "删除订单失败"),
-    ORDER__ERRORREFUND("45005", "订单申请退款失败"),
-    ORDER_PAY_GETPRE_MESSAGE_ERROR("45006", "获取预支付信息失败"),
-    ORDER_EDIT_ERROR("45007", "修改订单错误"),
-    ORDER_COPY_ERROR("45008", "订单复制失败"),
-    ORDER_CANCEL_ERROR("45009", "取消订单失败"),
-    ORDER_QUERY_QUEUE_INDEX_ERROR("45010", "查询订单排队号失败"),
-    ORDER_TAKEMEALTIME_INVAILD("45011", "你的取餐时间穿越了，请重新选择！"),
-    ORDER_TAKE_OUT_ADDRESS_INVAILD("45012", "外卖配送地址无效"),
-    ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY("45013", "收货地址超过配送范围"),
-    ORDER_QUERY_QUANTITYR_ERROR("45014", "获取当前门店制作中订单失败"),
-    ORDER_CREATE_VERIFICATION_ERROR("45015", "限时特价商品核销失败"),
-    ORDER_CREATE_TAKEMEALTIME_ERROR("45016", "取餐时间不正确"),
-    ORDER_CREATE_TIME_NOT_DELIVERY("45017", "不在外卖配送时间范围内"),
-    ORDER_CREATE_FORMID_ISNULL("45018", "0元购formId不能为空"),
-    ORDER_GET_PAY_EB_CODE_ERROR("45019", "没有配置支付payEbCode"),
-    ORDER_WXAPP_NOT_ENABLE_COLLECT_GOODS("45020","小程序未开通到店自取"),
-    PAY_AMOUNT_ERROR("45021","订单支付金额不能小于0"),
-    ORDER_NOT_EXIST("45022","订单不存在"),
-    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_PRE_PAYMENT_SUCCESS("45028","订单已支付"),
-    ENCIRCLEORDER_PRE_PAYMENT_CLOSE_FAILED("45029","关闭预支付订单失败"),
-    ENCIRCLEORDER_UPDATE_ORDER_LOCK("45030","有小伙伴正在下单，请稍后下单"),
-    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","订单中包含未称重商品"),
-    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_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","清空购物车异常"),
-    ORDER_PARTNER_ID_NOT_MATCTH("45050","商户不匹配"),
-    ORDER_STORE_ID_NOT_MATCTH("45051","门店不匹配"),
-    ORDER_REPEAT_DO_COMPLETE("45052", "重复操作，订单已经完成"),
-    ORDER_HAS_CANCELED("45053", "订单已经被取消"),
-    ORDER_MALL_NOT_MATCH("45054", "非商城订单，无法操作"),
-    AFFIRM_ORDER_FAIL("45055", "确认订单失败"),
-    ORDER_EMPTY_CREATE_PREPAY_FAIL("45056", "订单为空，创建预订单失败"),
-    ORDER_HAS_PAID("45057", "订单已支付或已完成"),
-    ORDER_PRE_PAYMENT_CLOSE_FAILED("45058","关闭预支付订单失败"),
-    ORDER_OWNER_ERROR("45059","订单归属错误"),
-    ORDER_STATUS_PRE_PAYMENT_NOT_SUPPORT("45060", "订单非待支付状态, 创建预支付失败"),
-    ORDER_TAKEMEALTIME_INVALID("45061", "你的隔日预约时间有误，请重新刷新后选择！"),
-    ORDER_CONVERT_ERROR("45062", "查询订单结果转换失败"),
-    ORDER_DELIVERY_CALL_BACK_FAILED("45083", "配送回调失败，为找到对应操作类型"),
-    ORDER_COLLECT_FAILED("45084", "推送入机失败,配送回调失败"),
-    ORDER_TAKE_MEAL_TIME_ERROR("450062", "你的到店取餐时间异常，请重新选择！"),
-    ORDER_MEALTIME_MISSING("450063", "你的取餐方式或取餐时间异常，请重新选择!"),
-    ORDER_TAKE_OUT_TIME_ERROR("450062", "你的外卖送达时间异常，请重新选择！"),
-    ORDER_TAKE_OUT_ADDRESS_NOT_VALID("45063", "收货地址校验失败"),
-    ORDER_PICK_UP_GOOD_NO("45064", "更新取餐码失败"),
-    ORDER_NOT_CREATE_ERROR("45065", "请不要重复创建订单"),
-    MULTIORDER__ERRORREFUND("45005", "订单申请退款失败"),
-    ORDER_GROUP_BUY_LIST_EMPTY("45069", "付款人列表为空，无法发起群收款"),
-    COLLAGE_ORDER_CREATE_ERROR_NOT_EXIST("45070", "拼单信息不存在，无法创建订单"),
-    COLLAGE_ORDER_CREATE_ERROR_PAYING("45071", "拼单正在支付，请勿重复提交"),
-    COLLAGE_ORDER_CREATE_ERROR_PAYED("45072", "拼单已支付完成，请返回订单列表查看"),
+    ORDER_CREATE_ERROR("45001", "订单创建失败",""),
+    ORDER_PAYACCESS_ERROR("45002", "订单支付成功确认失败",""),
+    ORDER_QUERYORDER_ERROR("45003", "查询订单失败","Order query failed"),
+    ORDER_DELETE_ERROR("45004", "删除订单失败",""),
+    ORDER__ERRORREFUND("45005", "订单申请退款失败",""),
+    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", "查询订单排队号失败",""),
+    ORDER_TAKEMEALTIME_INVAILD("45011", "你的取餐时间穿越了，请重新选择！",""),
+    ORDER_TAKE_OUT_ADDRESS_INVAILD("45012", "外卖配送地址无效",""),
+    ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY("45013", "收货地址超过配送范围",""),
+    ORDER_QUERY_QUANTITYR_ERROR("45014", "获取当前门店制作中订单失败",""),
+    ORDER_CREATE_VERIFICATION_ERROR("45015", "限时特价商品核销失败",""),
+    ORDER_CREATE_TAKEMEALTIME_ERROR("45016", "取餐时间不正确",""),
+    ORDER_CREATE_TIME_NOT_DELIVERY("45017", "不在外卖配送时间范围内",""),
+    ORDER_CREATE_FORMID_ISNULL("45018", "0元购formId不能为空",""),
+    ORDER_GET_PAY_EB_CODE_ERROR("45019", "没有配置支付payEbCode",""),
+    ORDER_WXAPP_NOT_ENABLE_COLLECT_GOODS("45020","小程序未开通到店自取",""),
+    PAY_AMOUNT_ERROR("45021","订单支付金额不能小于0",""),
+    ORDER_NOT_EXIST("45022","订单不存在",""),
+    ORDER_HAD_EVALUATE("45023","订单已评价",""),
+    ENCIRCLEORDER_TABLENUMBER_LOCK_ERROR("45025","调用基础服务清台失败",""),
+    ENCIRCLEORDER_TABLENUMBER_LOCK_USERINFO_ERROR("45026","开台获取用户信息失败",""),
+    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","有小伙伴正在下单，请稍后下单","There is a small partner placing an order, please place an order later"),
+    ORDER_COMPAR_PRODUCTS_CHANGE("45031", "订单价格变动,总金额:￥ ",""),
+    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","订单正在支付","The order is being paid"),
+    ORDER_NOT_ALLOW_REFUND("45100", "退款失败，请和店员伙伴约定线下退款",""),
+    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", "重复操作，订单已经完成",""),
+    ORDER_HAS_CANCELED("45053", "订单已经被取消",""),
+    ORDER_MALL_NOT_MATCH("45054", "非商城订单，无法操作",""),
+    AFFIRM_ORDER_FAIL("45055", "确认订单失败",""),
+    ORDER_EMPTY_CREATE_PREPAY_FAIL("45056", "订单为空，创建预订单失败",""),
+    ORDER_HAS_PAID("45057", "订单已支付或已完成",""),
+    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", "你的隔日预约时间有误，请重新刷新后选择！",""),
+    ORDER_CONVERT_ERROR("45062", "查询订单结果转换失败",""),
+    ORDER_DELIVERY_CALL_BACK_FAILED("45083", "配送回调失败，为找到对应操作类型",""),
+    ORDER_COLLECT_FAILED("45084", "推送入机失败,配送回调失败",""),
+    ORDER_TAKE_MEAL_TIME_ERROR("450062", "你的到店取餐时间异常，请重新选择！",""),
+    ORDER_MEALTIME_MISSING("450063", "你的取餐方式或取餐时间异常，请重新选择!",""),
+    ORDER_TAKE_OUT_TIME_ERROR("450062", "你的外卖送达时间异常，请重新选择！",""),
+    ORDER_TAKE_OUT_ADDRESS_NOT_VALID("45063", "收货地址校验失败",""),
+    ORDER_PICK_UP_GOOD_NO("45064", "更新取餐码失败",""),
+    ORDER_NOT_CREATE_ERROR("45065", "请不要重复创建订单",""),
+    MULTIORDER__ERRORREFUND("45005", "订单申请退款失败",""),
+    ORDER_GROUP_BUY_LIST_EMPTY("45069", "付款人列表为空，无法发起群收款",""),
+    COLLAGE_ORDER_CREATE_ERROR_NOT_EXIST("45070", "拼单信息不存在，无法创建订单",""),
+    COLLAGE_ORDER_CREATE_ERROR_PAYING("45071", "拼单正在支付，请勿重复提交",""),
+    COLLAGE_ORDER_CREATE_ERROR_PAYED("45072", "拼单已支付完成，请返回订单列表查看",""),
 
-    ORDER_CANCEL_ERROR_EXPECT_TIME("45067", "预约时间还剩15分钟，无法取消"),
-    ORDER_CANCEL_ERROR_ESTIMATE_TIME("45068", "预计送达还剩30分钟，无法取消"),
-    STORE_SELF_ERROR("45069", "请选择截止营业时间大于45分钟下单"),
-    COUPON_INVALID("45070", "券已锁定，请先支付或取消待支付订单"),
+    ORDER_CANCEL_ERROR_EXPECT_TIME("45067", "预约时间还剩15分钟，无法取消",""),
+    ORDER_CANCEL_ERROR_ESTIMATE_TIME("45068", "预计送达还剩30分钟，无法取消",""),
+    STORE_SELF_ERROR("45069", "请选择截止营业时间大于45分钟下单",""),
+    COUPON_INVALID("45070", "券已锁定，请先支付或取消待支付订单",""),
 
 
     /**
      * 支付
      */
-    PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常"),
+    PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常","Abnormal payment transaction"),
     /**
      * 优惠券活动
      */
-    COUPON_QUERY_ERROR("46001", "获取优惠券信息失败"),
-    COUPON_FULL_ACTIVITY_ERROR("46009", "获取满减信息失败"),
-    COUPON_GETINFO_INVAILD("46002", "优惠券信息不存在"),
-    COUPON_NOT_REACH_CONDITION("46003", "不满足券的指定消费金额"),
-    ACTIVITY_NOT_EXIST("46004", "错过是最美好的相遇！您访问的活动不存在"),
-    ACTIVITY_QUERY_ERROR("46005", "活动查询失败"),
-    COUPON_GET_ERROR("46006", "优惠券领取失败"),
-    ACTIVITY_JOIN_FAIL("46007", "参加活动失败"),
-    COUPON_NOT_SHARED("46008", "券不可与其他活动同享"),
-    COUPON_NOT_ADD_WEIXIN_CARD("46009", "该优化券不能加入微信卡包"),
-    COUPON_SHOP_NOTSUPPORT("46010","优惠券在当前门店不可用"),
-    COUPON_ORDER_WAY_ERROR("46011", "您选择得优惠券不适用该点餐方式"),
-    COUPON_VERIFICATION_FAIL("46012","优惠券核销失败"),
-    COUPON_CALLBACK_FAIL("46013","优惠券移除卡包失败"),
-    COUPON_INVAILD("46014", "优惠券失效"),
-    COUPON_DATETIME_INVAILD("46015", "优惠券在当前时间不可用"),
-    COUPON_ORDER_ORIGINAL_AMOUNT_NOT_ENOUGH("46016","优惠券不满足可用金额门槛"),
+    COUPON_QUERY_ERROR("46001", "获取优惠券信息失败",""),
+    COUPON_FULL_ACTIVITY_ERROR("46009", "获取满减信息失败",""),
+    COUPON_GETINFO_INVAILD("46002", "优惠券信息不存在",""),
+    COUPON_NOT_REACH_CONDITION("46003", "不满足券的指定消费金额",""),
+    ACTIVITY_NOT_EXIST("46004", "错过是最美好的相遇！您访问的活动不存在",""),
+    ACTIVITY_QUERY_ERROR("46005", "活动查询失败",""),
+    COUPON_GET_ERROR("46006", "优惠券领取失败",""),
+    ACTIVITY_JOIN_FAIL("46007", "参加活动失败",""),
+    COUPON_NOT_SHARED("46008", "券不可与其他活动同享",""),
+    COUPON_NOT_ADD_WEIXIN_CARD("46009", "该优化券不能加入微信卡包",""),
+    COUPON_SHOP_NOTSUPPORT("46010","优惠券在当前门店不可用",""),
+    COUPON_ORDER_WAY_ERROR("46011", "您选择得优惠券不适用该点餐方式",""),
+    COUPON_VERIFICATION_FAIL("46012","优惠券核销失败",""),
+    COUPON_CALLBACK_FAIL("46013","优惠券移除卡包失败",""),
+    COUPON_INVAILD("46014", "优惠券失效",""),
+    COUPON_DATETIME_INVAILD("46015", "优惠券在当前时间不可用",""),
+    COUPON_ORDER_ORIGINAL_AMOUNT_NOT_ENOUGH("46016","优惠券不满足可用金额门槛",""),
     /**
      * 加价购商品
      */
-    PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST("47001", "换购商品已失效啦，请重新下单"),
-    PREMIUM_EXCHANGE_SKU_DEFICIENCY("47002", "您选择的换购商品库存不足，请重新下单"),
+    PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST("47001", "换购商品已失效啦，请重新下单",""),
+    PREMIUM_EXCHANGE_SKU_DEFICIENCY("47002", "您选择的换购商品库存不足，请重新下单",""),
 
     /**
      * 微信卡券
      */
-    WEICHAT_SHOP_NOTSUPPORT("48001","当前门店不可用"),
-    WEICHAT_NOT_PRODUCTCARD("48002","不是商品券不用加入购物车"),
-    WEICHAT_PRODUCT_NOEXIST("48003","商品不存在"),
+    WEICHAT_SHOP_NOTSUPPORT("48001","当前门店不可用",""),
+    WEICHAT_NOT_PRODUCTCARD("48002","不是商品券不用加入购物车",""),
+    WEICHAT_PRODUCT_NOEXIST("48003","商品不存在",""),
 
     /**
      * 配送单
      */
-    DELIVERY_QUERY_ERROR("50024","查询配送单失败"),
-    DELIVERY_CANCEL_ORDER_ERROR("53012", "取消配送单失败"),
-    DELIVERY_REMINDER_ORDER_ERROR("53013", "订单状态不是配送中，不能催单"),
-    DELIVERY_QUERY_RIDER_STATUS_ERROR("53014", "订单状态不是配送中，不能查询骑手位置"),
-    DELIVERY_REMINDER_ERROR("53015","催单失败"),
-    DELIVERY_QUERY_RIDER_ERROR("53016","查询骑手位置失败"),
-    DELIVERY_NOT_EXIST("53017","当前订单没有配送单"),
+    DELIVERY_QUERY_ERROR("50024","查询配送单失败",""),
+    DELIVERY_CANCEL_ORDER_ERROR("53012", "取消配送单失败",""),
+    DELIVERY_REMINDER_ORDER_ERROR("53013", "订单状态不是配送中，不能催单",""),
+    DELIVERY_QUERY_RIDER_STATUS_ERROR("53014", "订单状态不是配送中，不能查询骑手位置",""),
+    DELIVERY_REMINDER_ERROR("53015","催单失败",""),
+    DELIVERY_QUERY_RIDER_ERROR("53016","查询骑手位置失败",""),
+    DELIVERY_NOT_EXIST("53017","当前订单没有配送单",""),
 
     /**
      * 配送信息
      */
-    DELIVERY_INFO_NOT_DELIVERY("60001", "当前地址不可配送"),
-    DELIVERY_INFO_ERROR("60002","配送地址不正确"),
-    DELIVERY_CREATE_ERROR("60003","运单不足，配送失败"),
+    DELIVERY_INFO_NOT_DELIVERY("60001", "当前地址不可配送",""),
+    DELIVERY_INFO_ERROR("60002","配送地址不正确",""),
+    DELIVERY_CREATE_ERROR("60003","运单不足，配送失败",""),
 
 
     /**
      * coco券验证失败
      */
-    COCO_COUPON_VALIDATOR_FAIL("70000", "优惠券验证错误"),
+    COCO_COUPON_VALIDATOR_FAIL("70000", "优惠券验证错误",""),
     ;
 
 
@@ -241,14 +241,16 @@ public enum ResponseResult {
 
     private String code;
     private String message;
+    private String enMessage;
 
     /**
      * @param code    状态码
      * @param message 提示信息
      */
-    ResponseResult(String code, String message) {
+    ResponseResult(String code, String message,String enMessage) {
         this.code = code;
         this.message = message;
+        this.enMessage = enMessage;
     }
 
     public String getCode() {
@@ -267,6 +269,14 @@ public enum ResponseResult {
         this.message = message;
     }
 
+    public String getEnMessage() {
+        return enMessage;
+    }
+
+    public void setEnMessage(String enMessage) {
+        this.enMessage = enMessage;
+    }
+
     public static ResponseResult getResponseResult(String code) {
         ResponseResult[] values = ResponseResult.values();
         for (ResponseResult value : values) {

order-application-service/src/main/java/cn/freemud/interceptor/ServiceException.java

@@ -15,9 +15,12 @@ public class ServiceException extends RuntimeException {
 
     private String message;
 
+    private String enMessage;
+
     public ServiceException(ResponseResult result) {
         this.result = result;
         this.message = result.getMessage();
+        this.enMessage = result.getEnMessage();
     }
 
     public ServiceException(ResponseResult result, String message) {
@@ -42,4 +45,12 @@ public class ServiceException extends RuntimeException {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public String getEnMessage() {
+        return enMessage;
+    }
+
+    public void setEnMessage(String enMessage) {
+        this.enMessage = enMessage;
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java

@@ -149,7 +149,6 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeTable.getCode()) || storeTable.getData() == null) return ResponseUtil.error(ResponseResult.STORE_NOT_TABLE_INFO);
         if(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR);
         if(storeTable.getData().getOrderState() == 1) {
-            log.info("门店返回1,已开台");
             return ResponseUtil.success();
         }
         /**

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/aop/IgnoreFeignLogAnnotation.java → shopping-cart-application-service/src/main/java/cn/freemud/annotations/IgnoreFeignLogAnnotation.java

-package cn.freemud.aop;
+package cn.freemud.annotations;
 
 import java.lang.annotation.*;
 

shopping-cart-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java

+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

+package cn.freemud.aop;
+
+import cn.freemud.base.entity.BaseResponse;
+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.demo.controller.ShoppingCartDemoController;
@@ -80,6 +81,7 @@ public class ShoppingCartController {
     /**
      * 向购物车中添加商品
      */
+    @IsConvertEN
     @PostMapping(value = "/addGoods")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "addGoods")
     public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
@@ -95,6 +97,7 @@ public class ShoppingCartController {
     /**
      * 修改购物车中商品数量
      */
+    @IsConvertEN
     @PostMapping(value = "/updateGoodsQty")
     @LogIgnore(logMessage = "updateGoodsQty")
     public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
@@ -110,6 +113,7 @@ public class ShoppingCartController {
     /**
      * 查询购物车信息
      */
+    @IsConvertEN
     @PostMapping(value = "/listCartGoods")
     @LogIgnore(logMessage = "listCartGoods")
     public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
@@ -143,6 +147,7 @@ public class ShoppingCartController {
     /**
      * 清空购物车
      */
+    @IsConvertEN
     @PostMapping(value = "/clearCartGoods")
     @LogIgnore(logMessage = "clearCartGoods")
     public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
@@ -163,6 +168,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/impl/ShoppingCartMealServiceImpl.java

@@ -97,13 +97,15 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
 
     @Override
     public BaseResponse addGoods(AddShoppingCartGoodsRequestVo requestVo) {
-
         // 获取用户信息
         CustomerInfoVo customerInfo = getCustomerInfoVo(requestVo.getSessionId());
-        //todo 单元测试使用
-        //customerInfo = test(customerInfo, requestVo.getSessionId());
-
-        checkBase(customerInfo);
+        if (customerInfo == null || customerInfo.getMemberId() == null) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        if (StringUtils.isBlank(customerInfo.getTableNumber()) || StringUtils.isBlank(customerInfo.getStoreId()) || StringUtils.isBlank(customerInfo.getPartnerId())) {
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_NO_BIND_TABLE_NUMBER);
+        }
+//        checkBase(customerInfo);
         String userId = customerInfo.getMemberId();
         String partnerId = customerInfo.getPartnerId();
         String storeId = customerInfo.getStoreId();
@@ -129,7 +131,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         List<ProductBeanDTO> productBeanListSpuClass =
                 assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2), BusinessTypeEnum.SAAS_WC.getName(), mealCartBaseService);
         if (productBeanListSpuClass == null) {
-            throw new ServiceException(ResponseResult.SHOPPING_CART_ADD_ERROR);
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_ERROR);
         }
         //缓存中获取购物车商品信息
         // 注意，围餐和点餐redis数据结构不一样

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.*;