Merge branch '2020/10/29-fabu-huiyang'

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

@@ -1249,6 +1249,7 @@ public class OrderAdapter {
                 ordersBean.getOrderCostDetailList().forEach(o -> {
                     if(o.getCostType() == 10 && o.getBillType() == 1) {
                         ProductVo productVo = new ProductVo();
+                        productVo.setQty(1);
                         productVo.setName(o.getCostName());
                         productVo.setSpuName(o.getCostName());
                         productVo.setFinalPrice(o.getCostAmount().longValue());
@@ -2046,7 +2047,7 @@ public class OrderAdapter {
                 if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
                     Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
-                    if(null != extendType && (4 == extendType || 5 == extendType)) {
+                    if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) {
                         productVo.setCouponName(productDiscount.getDiscountDesc());
                     } else {
                         productVo.setName(productDiscount.getDiscountDesc());

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

@@ -42,8 +42,6 @@ public class ProductVo {
      * 商品spu名称
      */
     private String spuName;
-
-    private String couponName;
     /**
      * 商品的规格信息加属性信息
      */

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -168,7 +168,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         if (reviewStatus!=null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())){
             orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType());
             orderManagerRequest.setReason("配送回调-拒绝退款");
-            return orderManagerAdapter.orderRejectRefund(orderManagerRequest);
+            return orderManagerAdapter.mcCafeOrderRejectRefund(orderManagerRequest);
         }
         if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()){
             orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType());

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

@@ -1488,8 +1488,16 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             req.setOrderCode(orderBean.getOid());
 
             orderSdkService.updateCostCouponCode(req,LogTreadLocal.getTrackingNo());
+
+            List<OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
+                    account -> (withOrderBuyCouponCode.equals(account.getAccountId()))
+            ).collect(Collectors.toList());
+
+            if(CollectionUtils.isNotEmpty(accountList)) {
+                accountList.forEach(o -> o.setAccountId(buyCouponCode));
+            }
         } catch (Exception e){
-            LogUtil.error("getProducts_exception", null, null, e);
+            LogUtil.error("买券异常", null, null, e);
         }
     }
 

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

@@ -184,6 +184,23 @@ public class OrderManagerAdapter {
         return handleResponse(request,orderBean,orderManagerResponse);
     }
 
+    /**
+     * 拒绝退款
+     * @param request
+     * @return
+     */
+    public BaseResponse mcCafeOrderRejectRefund(OrderManagerRequest request) {
+        //查询订单
+        QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        //订单接单参数校验
+        BaseResponse verifyResponse = orderVerifyHandle.mcCafeOrderRejectRefund(orderBean, request);
+        if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
+            return handleResponse(request,orderBean,verifyResponse);
+        }
+        BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRejectRefund(request, orderBean);
+        return handleResponse(request,orderBean,orderManagerResponse);
+    }
+
 
     private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean,BaseResponse result) {
         if (orderBean==null){

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -302,6 +303,39 @@ public class OrderVerifyHandle {
     }
 
     /**
+     * 拒绝退款
+     * @param orderBean
+     * @param request
+     * @return
+     */
+    public BaseResponse mcCafeOrderRejectRefund(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+        //判断当前订单是否发起退款
+        if (orderBean.getHasRefund() == null || !orderBean.getHasRefund()) {
+            return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
+        }
+
+        if(CollectionUtils.isEmpty(orderBean.getRefundList())) {
+            return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
+        }
+
+        for (QueryOrdersResponse.DataBean.OrderBean.RefundBean refundBean : orderBean.getRefundList()) {
+            if (ObjectUtils.equals(refundBean.getStatus(), RefundStatus.COMPLETE_REFUND.getCode())) {
+                return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_REPETITION);
+            }
+
+            if (OrderStatus.CANCEL.getCode().equals(orderBean.getStatus())) {
+                return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_END);
+            }
+
+            if (ObjectUtils.equals(refundBean.getStatus(), RefundStatus.APPLY_REFUND.getCode())) {
+                break;
+            }
+        }
+
+        return ResponseUtil.success();
+    }
+
+    /**
      * 通用校验
      *
      * @param orderBean