Merge branch 'feature/1.9.38-【POS插件】不允许退款的订单返回文案调整-肖家炜' into qa

# Conflicts:
#	order-application-service/pom.xml

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

@@ -603,6 +603,10 @@ public class OrderServiceImpl implements Orderservice {
     @Override
     public String refundNotifyCallback(RefundNotifyCallbackRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();
+        if (StringUtils.isEmpty(requestVo.getTransId())) {
+            //订单号不能为空
+            return refundFaileMessage("transId is can not empty");
+        }
         Integer refundStatus = requestVo.getRefundStatus();
         if (!Objects.equals(refundStatus, ResponseCodeConstant.RESPONSE_SUCCESS)) {
             //只有退款成功更新状态.其他情况不处理

order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java

@@ -160,7 +160,7 @@ public enum ResponseResult {
     REJECT_ORDER_FAIL("45075", "拒单失败"),
     AGREE_REFUND_ORDER_FAIL("45076", "同意退款失败"),
     ORDER_REFUND_NOT_APPLY("45077","用户未申请退款"),
-    ORDER_HAD_AFFIRM_CAN_NOT_REFUND("45078","当前订单不允许退款，请前往B端后台设置"),
+    ORDER_HAD_AFFIRM_CAN_NOT_REFUND("45078","当前订单不允许退款，请联系管理员设置"),
     ORDER_REJECT_REFUND_REPETITION("45079","重复操作，订单已拒绝退款"),
     ORDER_REJECT_REFUND_STATUS_NOT("45080","订单不是申请退款中，不能操作"),
     ORDER_REJECT_REFUND_STATUS_END("45081","订单未接单或者已取消，不能操作"),