Merge branch 'master' into dev

@@ -39,6 +39,10 @@ public enum ButtonShow {
     }
     }
 
 
     public ButtonShowBo getBo(CancelType cancelType) {
     public ButtonShowBo getBo(CancelType cancelType) {
+        if(cancelType == null){
+            return bo;
+        }
+
         switch (cancelType){
         switch (cancelType){
             case SELF_BEFORE_PAY:
             case SELF_BEFORE_PAY:
                 bo.setConfirmTips("您确定不卖此商品吗？");
                 bo.setConfirmTips("您确定不卖此商品吗？");

@@ -98,6 +98,7 @@ public class AppraiseService {
                 .skup(skup);
                 .skup(skup);
         try {
         try {
             paymentService.refund(req);
             paymentService.refund(req);
+
         }catch (Exception ex){
         }catch (Exception ex){
             LOGGER.warn("in appraiseSuccess, refund fail, req {}", req, ex);
             LOGGER.warn("in appraiseSuccess, refund fail, req {}", req, ex);
             BillLogEvent sellerBillLogEvent = bleb.tradeStatus(200)
             BillLogEvent sellerBillLogEvent = bleb.tradeStatus(200)

@@ -46,6 +46,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
     @Autowired
     @Autowired
     private SellerOrderGoodsMapper sellerOrderGoodsMapper;
     private SellerOrderGoodsMapper sellerOrderGoodsMapper;
 
 
+
     @Override
     @Override
     public PageResp<OrderListInfo> getOrderList(OrderListRequest request){
     public PageResp<OrderListInfo> getOrderList(OrderListRequest request){
         int type;
         int type;