付第三方跳转

src/main/java/com/caimei/modules/order/entity/ChangePayShopOther.java

@@ -99,6 +99,8 @@ public class ChangePayShopOther implements Serializable {
      */
     private Integer payShopId;
 
+    private Integer redirectType;
+
     public Integer getId() {
         return id;
     }
@@ -250,4 +252,12 @@ public class ChangePayShopOther implements Serializable {
     public void setPayShopId(Integer payShopId) {
         this.payShopId = payShopId;
     }
+
+    public Integer getRedirectType() {
+        return redirectType;
+    }
+
+    public void setRedirectType(Integer redirectType) {
+        this.redirectType = redirectType;
+    }
 }

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -1073,7 +1073,10 @@ public class CmPayShopController extends BaseController {
     public String saveShopOtherFee(ChangePayShopOther payShopOther, RedirectAttributes redirectAttributes) {
         cmPayShopService.saveShopOtherFee(payShopOther);
         addMessage(redirectAttributes, "保存成功");
-        return "redirect:" + Global.getAdminPath() + "/order/cmPayShop/payList";
+        if ((null != payShopOther.getPayType() && 2 == payShopOther.getPayType()) || 2 == payShopOther.getRedirectType() ) {
+            return "redirect:" + Global.getAdminPath() + "/order/cmPayShop/payList?repage";
+        }
+        return "redirect:" + Global.getAdminPath() + "/order/cmPayShop/?repage";
     }
 
     /**

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -179,14 +179,14 @@ public class ClubPortraitService {
                     orderPortrait.setName("二手订单 【 0 %】 【" + secondHand + "个】");
                 }
                 orderPortraits.add(orderPortrait);
-                orderPortrait = new OrderPortrait();
+                /*orderPortrait = new OrderPortrait();
                 orderPortrait.setValue(rebate);
                 if (rebate != 0) {
                     orderPortrait.setName("返佣订单 【" + instance.format((float) rebate / (float) length * 100) + "%】 【" + rebate + "个】");
                 } else {
                     orderPortrait.setName("返佣订单 【 0 %】 【" + rebate + "个】");
                 }
-                orderPortraits.add(orderPortrait);
+                orderPortraits.add(orderPortrait);*/
                 /*orderPortrait = new OrderPortrait();
                 orderPortrait.setValue(partialRefund);
                 if (partialRefund != 0) {

src/main/webapp/WEB-INF/views/modules/order/cmPayShopOtherForm.jsp

@@ -230,7 +230,7 @@
     </c:if>
     <li class="active"><a>提交付款单</a></li>
 </ul>
-<form:form id="inputForm" modelAttribute="payShopOther" action="${ctx}/order/cmPayShop/saveShopOtherFee" method="post" class="form-horizontal">
+<form:form id="inputForm" modelAttribute="payShopOther" action="${ctx}/order/cmPayShop/saveShopOtherFee?payType=1&redirectType=1" method="post" class="form-horizontal">
     <form:hidden path="shopOrderId"/>
     <form:hidden path="payShopId"/>
     <div class="payment-form">

src/main/webapp/WEB-INF/views/modules/order/shopOtherFeeForm.jsp

@@ -232,7 +232,7 @@
     <li class="active"><a
             href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${payShopOther.shopOrderId}&payType=${payType}">付第三方</a></li>
 </ul>
-<form:form id="inputForm" modelAttribute="payShopOther" action="${ctx}/order/cmPayShop/saveShopOtherFee?payType=${payType}" method="post"
+<form:form id="inputForm" modelAttribute="payShopOther" action="${ctx}/order/cmPayShop/saveShopOtherFee?payType=${payType}&redirectType=1" method="post"
            class="form-horizontal">
     <form:hidden path="shopOrderId"/>
     <input style="display: none" name="payType" value="${payType}"/>