Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group

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

@@ -2051,6 +2051,8 @@ public class OrderServiceImpl implements Orderservice {
             } else {
                 //调用支付退款
                 com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+                //抖音支付退款必传
+                orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款":orderRefundVo.getReason());
                 response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
                 if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
@@ -2079,7 +2081,7 @@ public class OrderServiceImpl implements Orderservice {
         cancelOrderRequest.setExtInfoReq(salesOrderExtInfoReq);
 
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
-        if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
+        if (baseOrderResponse == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
         }
         return null;

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

@@ -79,6 +79,8 @@ public class PaymentHandle {
     public PayRefundResponse refund(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
         PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
         OrderRefundRequest orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean,getRefundAmount(orderBean));
+        //抖音支付必传
+        orderRefundRequest.setRefundDesc(request.getReason() == null? "商家退款" : request.getReason());
         if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
             return handlePayRefundResponse(refundStatus,orderRefundRequest.getRefundId());
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/ScoreSharingService.java

@@ -77,8 +77,7 @@ public class ScoreSharingService {
             if (getValue(userScoreUseDetail.getResult().getOverlayOffers()) == 0) {
                 customerScoreVo.setScoreReduceState(getValue(userScoreUseDetail.getResult().getScoreState()));
             } else {
-                if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (discountResult != null && discountResult.getTotalDiscountAmount().intValue() > 0)
-                        || (discountResult != null && !CollectionUtils.isEmpty(discountResult.getDiscounts()))) {
+                if (discountResult != null && !CollectionUtils.isEmpty(discountResult.getDiscounts())) {
                     //是否有换购
                     int type81 = 0;
                     for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : discountResult.getDiscounts()) {