瑕疵分等级扣款

qinchao
Commit daba5a39787bb8da5b7ee515223e8dfb8fdd0e0d 1 parent b0069cd6
Showing 2 changed files with 7 additions and 4 deletions
order/src/main/java/com/yohoufo/order/common/ActionStatusHold.java
order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
--- a/order/src/main/java/com/yohoufo/order/common/ActionStatusHold.java
View file @daba5a3
+++ b/order/src/main/java/com/yohoufo/order/common/ActionStatusHold.java
View file @daba5a3
@@ -101,6 +101,7 @@ public class ActionStatusHold {
                     SellerOrderStatus.PLAY_SELF.getCode(),
                     SellerOrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(),
                     SellerOrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(),
+                    SellerOrderStatus.MINI_FAULT_REJECT.getCode(),
                     // 支付成功回调超时，但已经超时取消了，这种场景可以退款
                     SellerOrderStatus.TIMEOUT_CANCEL.getCode(),
                     SellerOrderStatus.SELf_CANCEL_PAY.getCode());
--- a/order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
View file @daba5a3
+++ b/order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
View file @daba5a3
@@ -7,12 +7,9 @@ import com.yohobuy.ufo.model.order.bo.MerchantOrderAttachInfo;
 import com.yohobuy.ufo.model.order.common.*;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.common.alarm.EventBusPublisher;
-import com.yohoufo.common.alarm.SmsAlarmEvent;
-import com.yohoufo.common.exception.UfoServiceException;
 import com.yohoufo.common.utils.DateUtil;
 import com.yohoufo.dal.order.*;
 import com.yohoufo.dal.order.model.*;
-import com.yohoufo.order.common.BillTradeStatus;
 import com.yohoufo.order.common.RefundCase;
 import com.yohoufo.order.common.TransferCase;
 import com.yohoufo.order.constants.AlarmConfig;
@@ -478,7 +475,12 @@ public class AppraiseService {
             long sellerOrderCode = sellerOrder.getOrderCode();
             final SellerOrderStatus expectSOStatus = SellerOrderStatus.HAS_PAYED;
-            final SellerOrderStatus targetSoStatus = SellerOrderStatus.APPRAISAL_FAIL_COMPENSATE;
+            final SellerOrderStatus targetSoStatus ;
+            if(type==3 || type==4){
+                targetSoStatus = SellerOrderStatus.MINI_FAULT_REJECT;
+            }else{
+                targetSoStatus = SellerOrderStatus.APPRAISAL_FAIL_COMPENSATE;
+            }
             SellerOrder tso = new SellerOrder();
             tso.setUid(sellerUid);
             tso.setOrderCode(sellerOrderCode);