bugfix

src/main/java/com/caimei/modules/user/entity/NewCmClub.java

@@ -39,8 +39,6 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private Integer cityID;        // 市
     private Integer townID;        // 地址ID
     private String flag;        // 拉会所上线的用户的cmBindId,以逗号结尾
-    private Integer inviterBindID;        // 邀请者cmBindId
-    private String inviterName;        // 邀请者名称
     private Integer spID;        // 协销Id
     private Integer mainServiceProviderID;        // 协销经理Id
     private String scanTime;        // 扫描时间
@@ -260,19 +258,6 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     public void setFlag(String flag) {
         this.flag = flag;
     }
-    public Integer getInviterBindID() {
-        return inviterBindID;
-    }
-    public void setInviterBindID(Integer inviterBindID) {
-        this.inviterBindID = inviterBindID;
-    }
-    @Length(min = 0, max = 255, message = "邀请者名称长度必须介于 0 和 255 之间")
-    public String getInviterName() {
-        return inviterName;
-    }
-    public void setInviterName(String inviterName) {
-        this.inviterName = inviterName;
-    }
     public Integer getSpID() {
         return this.spID;
     }

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

@@ -241,9 +241,11 @@
         co.rebateFlag as rebateOrder,
         co.clauseID,
         co.clauseName,
+        c.clubName,
         s.name as shopName
         from cm_shop_order a
         left join cm_order co on co.orderID = a.orderID
+        left join club c on c.clubId = a.clubId
         left join bp_order_userinfo bou on bou.orderId = a.orderID
         left join shop s on a.shopId = s.shopId
         where a.shopOrderID = #{shopOrderID}

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

@@ -35,7 +35,7 @@
     </tr>
 
     <tr>
-        <td>机构：${order.buyer}
+        <td>机构：${order.clubName}
             <font id="svipFlagLabel" style="margin-left:0px" color="red">
                 <%--                <c:if test="${order.bpOrderUserinfo.firstClubType eq 1 and order.bpOrderUserinfo.svipFlag eq 1}">--%>
                 <%--                    (医美机构，超级会员)--%>
@@ -100,23 +100,6 @@
                 <font>有退款</font>
             </c:if>
         </td>
-        <td>机构：${order.buyer}
-            <font id="svipFlagLabel" style="margin-left:0px" color="red">
-                <%--                <c:if test="${order.bpOrderUserinfo.firstClubType eq 1 and order.bpOrderUserinfo.svipFlag eq 1}">--%>
-                <%--                    (医美机构，超级会员)--%>
-                <%--                </c:if>--%>
-                <%--                <c:if test="${order.bpOrderUserinfo.firstClubType eq 1 and order.bpOrderUserinfo.svipFlag eq null}">--%>
-                <%--                    ${order.bpOrderUserinfo.firstClubType eq 1?'(医美机构)':''}--%>
-                <%--                </c:if>--%>
-                <%--                <c:if test="${order.bpOrderUserinfo.firstClubType eq null and order.bpOrderUserinfo.svipFlag eq 1}">--%>
-                <%--                    ${order.bpOrderUserinfo.svipFlag eq 1?'(超级会员)':''}--%>
-                <%--                </c:if>--%>
-                <c:if test="${order.organizeID == 4}">（联合丽格）</c:if>
-            </font>
-        </td>
-    </tr>
-
-    <tr>
         <td>
             地址: ${fns:appendLast(fns:appendLast1(order.bpOrderUserinfo.province,order.bpOrderUserinfo.city,order.bpOrderUserinfo.town), order.bpOrderUserinfo.address)}
         </td>
@@ -144,7 +127,7 @@
                             <a href="${ctx}/order/cancelShopOrder?shopOrderId=${order.shopOrderID}"
                                onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
                         </c:if>
-<%--                                                <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>--%>
+                        <%--                                                <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>--%>
                     </shiro:hasPermission>
                 </div>
             </div>