Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei/modules/order/service/SplitAccountService.java

@@ -190,7 +190,7 @@ public class SplitAccountService extends BaseService {
 //                    accountPayOrderExt.setInMerchantNo(splitMoneyVo.getName());
                         accountPayOrderExt.setOrderType(AccountPayOrderType.TRANSFER);
 //                    accountPayOrderExt.setAmount(splitMoneyVo.getSplitMoney());
-                        accountPayOrderExt.setServerCallbackUrl(Constant.betaSplit);
+                        accountPayOrderExt.setServerCallbackUrl(Constant.prodSplit);
                         accountPayOrderExt.setGoodsName("分账");
                         if (null != splitBillRules && splitBillRules.size() > 0) {
                             accountPayOrderExt.setSplitBillRules(splitBillRules);
@@ -365,7 +365,7 @@ public class SplitAccountService extends BaseService {
             splitAccount.setSplitAccount(splitAmount);
             splitAccount.setProductType(3);
             splitAccount.setType(5);
-            splitAccount.setSubUserNo(Constant.CUSTOMERNUM);
+            splitAccount.setSubUserNo(Constant.CUSTOMERNUM2);
             logger.info("佣金分账参数------------->" + splitAccount);
             list.add(splitAccount);
         }

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -921,7 +921,7 @@
                c.name as clubName
         from cm_svip_history svipr
         left join cm_receipt_order_relation cror on svipr.id = cror.vipRecordId
-        left join club c on svipr.userId = c.clubID
+        left join club c on svipr.userId = c.userId
         left join cm_svip_package svipp on svipp.id = svipr.packageId
         where cror.receiptID=#{receiptID}
         LIMIT 1

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1320,7 +1320,9 @@
         SELECT COUNT(*) FROM
         cm_receipt_order_relation cror
         LEFT JOIN cm_discern_receipt cdr ON cdr.id = receiptID
+        LEFT JOIN cm_order co ON cror.orderId = co.orderId
         WHERE cdr.payWay=1
+          AND co.orderType != 2
           AND cror.orderID=#{orderID}
     </select>
     <insert id="insertSplitAccount">

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

@@ -418,7 +418,7 @@
         <div class="receipt-order-form">
             <div>
                 <c:if test="${not empty vo.vipInfo}">
-                    <span>机构名称：${vo.clubName}</span>
+                    <span>机构名称：${vo.vipInfo.clubName}</span>
                     <br/>
                     <span>购买时间：${vo.receiptDate}</span>
                     <span>会员套餐：${vo.vipInfo.duration}个月</span>