Merge branch 'feature/rui.zhu/pos点餐结算-20230308' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -985,6 +985,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
         request.setOperationClient(cancelOrderRequest.getOperationClient());
         request.setRefundState(cancelOrderRequest.getRefundState());
+        request.setRefundDeliveryAmount(cancelOrderRequest.isRefundDeliveryAmount());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -388,8 +388,8 @@ public class OrderCallBackMQService {
             if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
                 return;
             }
-            // 正常变化  订单正向操作
-            if (body.getOperateType() == 1 && "1".equals(body.getMsgType())) {
+            // 订单所有状态正常变化通知
+            if ("1".equals(body.getMsgType())) {
                 Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
                         OrderCallBackConfig.ORDER_STATUS_PROCESS_CENTER_QUEUE_ROUTING_KEY, OrderCallBackConfig.ORDER_STATUS_PROCESS_CENTER_QUEUE);
                 MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);

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

@@ -20,16 +20,11 @@ import javax.validation.constraints.NotEmpty;
 @Data
 public class GetOrderConfigRequestVo {
 
-    @NotBlank(message = "请先授权登陆")
-    @ApiModelProperty("用户登陆的session")
-    private String sessionId;
-
     @ApiModelProperty("商户号")
     @NotBlank(message = "partnerId必填")
     private String partnerId;
 
     @ApiModelProperty("小程序Id")
-//    @NotBlank(message = "miniAppId不能为空！")
     private String miniAppId;
 
     /** {@link OrderConfigEnum} */

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -208,16 +208,27 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
-        //支付退款
-        PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
-        // 退款异常
-        if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
-            return ResponseUtil.error(refundResponse.getResult());
-        }
-        //退款失败终止下面的退款流程
-        if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.FAIL.getCode()) == 0) {
-            return ResponseUtil.error(ResponseResult.REFUND_FAIL.getCode(), refundResponse.getMessage());
+        PayRefundResponse refundResponse = null;
+        // 只有线上付款的订单，拒单的时候才走退款流程
+        if (PayType.ONLINE_PAY.getCode().equals(orderBean.getPayType())) {
+            //支付退款
+            refundResponse = this.payRefundCommon(request, orderBean);
+            // 退款异常
+            if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
+                return ResponseUtil.error(refundResponse.getResult());
+            }
+            // 退款失败终止下面的退款流程
+            if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.FAIL.getCode()) == 0) {
+                return ResponseUtil.error(ResponseResult.REFUND_FAIL.getCode(), refundResponse.getMessage());
+            }
+        } else {
+            // 线下退款，直接默认为退款成功
+            refundResponse = new PayRefundResponse();
+            refundResponse.setRefundId(UUID.randomUUID().toString().replaceAll("-", ""));
+            refundResponse.setPayRefundStatus(PayRefundStatus.SUCCESS);
+            refundResponse.setMessage(PayRefundStatus.SUCCESS.getDesc());
         }
+
         //订单拒单
         saasOrderHandle.orderReject(request, refundResponse, orderBean);
         // 推送pos、微信消息中心