Merge branch '小助手门店操作退款-oms-基于pre分支' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

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

@@ -25,7 +25,6 @@ import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
 import cn.freemud.entities.dto.blacklist.BlacklistDto;
-import cn.freemud.entities.dto.blacklist.OrderBlacklistResp;
 import cn.freemud.entities.dto.coupon.CheckAndCancelRequest;
 import cn.freemud.entities.dto.coupon.CheckAndCancelResponseDTO;
 import cn.freemud.entities.dto.coupon.CouponResponseDTO;
@@ -96,7 +95,6 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome
 import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
 import com.freemud.application.sdk.api.constant.ResponseResultEnum;
-import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.common.OrderAndShoppingCommonRedisKey;
@@ -104,7 +102,6 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.*;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
 import com.freemud.application.sdk.api.ordercenter.request.*;
@@ -3627,7 +3624,8 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已取消，无法退款");
         }
         // fisherman 仅仅支持 餐饮类订单进行操作
-        if (BizTypeEnum.ORDINARY.getBizType().compareTo(orderBean.getBizType()) != 0) {
+        List<Integer> bizTypes = Arrays.asList(1,7);
+        if (!bizTypes.contains(orderBean.getBizType())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "仅支持餐饮订单操作");
         }
 
@@ -3746,7 +3744,7 @@ public class OrderServiceImpl implements Orderservice {
             request.setReason(orderRefundVo.getReason());
             request.setOperateType(cn.freemud.management.enums.OperateType.ORDER_DEVELOPER_AGREE_REFUND.getOpType());
             request.setOperator(orderRefundVo.getOperator());
-            BaseResponse baseResponse = orderManagerAdapter.developRefund(request);
+            BaseResponse baseResponse = orderManagerAdapter.orderRetryAgreeRefund(request);
             return baseResponse;
         }
         return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单未支付！");

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

@@ -68,6 +68,8 @@ public class OrderManagerController {
                 return orderManagerAdapter.orderCreateDelivery(request);
             case ORDER_CANCEL_DELIVERY:
                 return orderManagerAdapter.orderCancelDelivery(request);
+            case ORDER_RETRY_AGREE_REFUND:
+                return orderManagerAdapter.orderRetryAgreeRefund(request);
             default:
                 return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
         }

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

@@ -15,10 +15,9 @@ public enum OperateType {
     ORDER_CREATE_DELIVERY("orderCreateDelivery","创建配送"),
     ORDER_CANCEL_DELIVERY("orderCancelDelivery","取消配送"),
     /**
-     * 该操作无校验, 直接退款, 如果使用 请联系SE 进行报备,
-     * 该类型不给外部人员使用, 不对外部暴露接口
+     * 售后单重试退款操作
      */
-    ORDER_DEVELOPER_AGREE_REFUND("orderDeveloperAgreeRefund","售后人员同意退款");
+    ORDER_RETRY_AGREE_REFUND("orderRetryAgreeRefund","重试售后单退款"),;
 
     /**
      * 操作类型

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -373,7 +373,7 @@ public class OrderManagerAdapter {
      * 使用该方法 请先进行报备, 因为不暴露给外部使用, 不属于业务代码
      * @see OrderManagerAdapter#orderAgreeRefund(cn.freemud.management.entities.dto.request.order.OrderManagerRequest)
      */
-    public BaseResponse developRefund(OrderManagerRequest request) {
+    public BaseResponse orderRetryAgreeRefund(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         if (null == orderBean) {

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -731,7 +731,6 @@ public class ShoppingCartConvertAdapter {
             Long newOrigOriginalPrice = 0L;
             if (isSetMealProduct) {
                 newOrigOriginalPrice += cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
-                newOrigOriginalPrice += cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
             } else {
                 newOrigOriginalPrice = isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice();
             }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1833,6 +1833,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         calculationDiscountGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
         calculationDiscountGoods.setAddCartTime(cartGoods.getAddCartTime() == null ? 0 : cartGoods.getAddCartTime());
         calculationDiscountGoods.setGoodsQuantity(cartGoods.getQty());
+        // fisherman --> 老算价套餐子商品总价遗漏
         calculationDiscountGoods.setOriginalPrice(cartGoods.getFinalPrice());
         calculationDiscountGoods.setMemberDiscount(cartGoods.getMemberDiscount());
         calculationDiscountGoods.setSpuId(cartGoods.getSpuId());