Merge remote-tracking branch 'origin/master'

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.56-RELEASE</version>
+    <version>2.1.57-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -131,3 +131,4 @@
 | 2.1.54-RELEASE |   基础订单sdk qa/预发布、生产/环境使用LoadBalanced   | wuping | 2021-04-26|
 | 2.1.55-RELEASE |  统一升级华莱士微商城SDK   | 王航航 | 2021-05-10|
 | 2.1.56-RELEASE |  统一升级华莱士微商城SDK   | 张志恒 | 2021-05-11|
+| 2.1.57-RELEASE |  统一升级华莱士微商城SDK   | 张志恒 | 2021-05-11|
\ No newline at end of file

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

@@ -380,4 +380,10 @@ public interface OrderCenterSdkService {
      */
     BaseOrderResponse editAfterSalesExpress(EditAfterSalesExpressRequest afterSalesExpressRequest);
 
+    /**
+     * 订单拒绝退款 POS
+     */
+    BaseOrderResponse mallOrderRefundReject(CancelOrderRequest cancelOrderRequest);
+
+
 }

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

@@ -2098,4 +2098,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultGoodsReturned(request, afterSalesExpressRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
+
+    @Override
+    public BaseOrderResponse mallOrderRefundReject(CancelOrderRequest cancelOrderRequest) {
+        AfterSalesOperateReq request = new AfterSalesOperateReq();
+        request.setOrderClient(OrderClientType.SAASMALL.getIndex());
+        request.setPartnerId(cancelOrderRequest.getPartnerId());
+        request.setOrderCode(cancelOrderRequest.getOrderId());
+        request.setAfterSalesCode(cancelOrderRequest.getAfterSalesCode());
+        request.setAdultRemark(cancelOrderRequest.getReason());
+        request.setOperator(cancelOrderRequest.getOperator());
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultReject(request, cancelOrderRequest.getTrackingNo());
+        return orderSdkAdapter.convent2BaseOrderResponse(response);
+    }
 }

order-application-service/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.56-RELEASE</version>
+            <version>2.1.57-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -1815,6 +1815,16 @@ public class OrderAdapter {
                     orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
                     orderViewStatusDto.setButtonContactPartner(true);
                 }
+                if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
+                    orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
+                    orderViewStatusDto.setOrderStatusDesc("已取消");
+                    orderViewStatusDto.setOrderStatusDescText("订单已经取消~");
+                    orderViewStatusDto.setRiderName("订单已取消");
+                    orderViewStatusDto.setRiderText("订单已经取消");
+                    orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
+                    orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
+                    orderViewStatusDto.setButtonContactPartner(true);
+                }
             } else {
                 if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode());

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.56-RELEASE</version>
+            <version>2.1.57-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -85,45 +85,33 @@ public class MallOrderHandle {
     }
 
     /**
-     * 麦咖啡拒绝退款
+     * 同意退款
+     *
      * @param request
      * @param orderBean
      * @return
      */
-    public BaseResponse mcCafeRefundReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        CancelOrderRequest rejectRefundRequest = orderSdkAdapter.getRejectRefundRequest(request.getOperator(), request.getReason(), orderBean);
-        BaseOrderResponse baseOrderResponse = null;
-        for(int i=0;i<orderBean.getRefundList().size();i++) {
-
-            if (RefundStatus.APPLY_REFUND.getCode().equals(orderBean.getRefundList().get(i).getStatus())) {
-                rejectRefundRequest.setAfterSalesCode(orderBean.getRefundList().get(i).getRid());
-                baseOrderResponse = orderCenterSdkService.orderRefundReject(rejectRefundRequest);
-            }
-            if (RefundStatus.COMPLETE_REFUND.getCode().equals(orderBean.getRefundList().get(i).getStatus())) {
-                baseOrderResponse = new BaseOrderResponse();
-                baseOrderResponse.setErrcode(100);
-                baseOrderResponse.setErrmsg("success");
-            }
-        }
+    public BaseResponse mallOrderAgreeApply(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest("", request.getReason(), request.getOperator(), orderBean);
+        BaseOrderResponse baseOrderResponse  = orderCenterSdkService.mallOrderAgreeApply(refundAgreeRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            return ResponseUtil.error(ResponseResult.REJECT_REFUND_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.AGREE_REFUND_APPLY_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
+
     /**
-     * 同意退款
-     *
+     * 拒绝退款
      * @param request
      * @param orderBean
      * @return
      */
-    public BaseResponse mallOrderAgreeApply(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest("", request.getReason(), request.getOperator(), orderBean);
-        BaseOrderResponse baseOrderResponse  = orderCenterSdkService.mallOrderAgreeApply(refundAgreeRequest);
+    public BaseResponse mallRefundReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        CancelOrderRequest rejectRefundRequest = orderSdkAdapter.getRejectRefundRequest(request.getOperator(), request.getReason(), orderBean);
+        BaseOrderResponse baseOrderResponse = orderCenterSdkService.mallOrderRefundReject(rejectRefundRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            return ResponseUtil.error(ResponseResult.AGREE_REFUND_APPLY_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.REJECT_REFUND_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
-
 }

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

@@ -106,7 +106,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
     @Override
     public BaseResponse<OrderManagerResponse> orderRejectRefund(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //拒绝退款
-        mallOrderHandle.refundReject(request,orderBean);
+        mallOrderHandle.mallRefundReject(request,orderBean);
         // 推送pos、微信消息中心
         orderBaseService.sendMessage(orderBean, OperateType.ORDER_REJECT_REFUND, request.getReason());
         return ResponseUtil.success();