Merge remote-tracking branch 'origin/feature/refundFlag-刘鹏飞'

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

@@ -130,7 +130,7 @@ public enum ResponseResult {
     CREATE_ORDER_CHECK_STORE_ERROR("45038","门店ID 不能为空"),
     CREATE_ORDER_CHECK_ORDERTYPE_ERROR("45039","下单类型不能为空"),
     ORDER_PRE_PAYMENT_LOCK("45040","订单正在支付"),
-    ORDER_NOT_ALLOW_REFUND("45100", "暂不支持已完成订单申请订单退款"),
+    ORDER_NOT_ALLOW_REFUND("45100", "退款失败，请和店员伙伴约定线下退款"),
     QUERY_TABLESTATUS_ACTIVEFLAG_ERROR("45041","桌号禁用"),
     PREVIEWORDER_UPDATE_ORDERPRICE_ERROR("45042","修改订单失败"),
     UPDATE_ORDER_INFO_ERROR("45043","下单失败"),

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

@@ -1945,12 +1945,13 @@ public class OrderServiceImpl implements Orderservice {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "您的申请已被商家拒绝，请联系门店沟通。");
                 }
             }
-            if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
+            // 【优化】【小程序】顾客申请退款提交时，判断当前的订单状态，是否允许申请退款
+            //if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
                 boolean refundButton = orderAdapter.checkRefundButton(queryOrderByIdResponse.getData(), userInfo.getWxAppId());
                 if (!refundButton) {
                     return ResponseUtil.error(ResponseResult.ORDER_NOT_ALLOW_REFUND.getCode(), ResponseResult.ORDER_NOT_ALLOW_REFUND.getMessage());
                 }
-            }
+            //}
             List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = cacheOpenPlatformPartnerWxappConfigManager.cacheSelectDefaultPage(userInfo.getWxAppId(), "2");
 
             Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));