小优化

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -27,7 +27,7 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
 
     List<NewOrder> findOrderList(NewOrder newOrder);
 
-    Double findPaidOrderID(@Param("orderID")Integer orderID);
+    Double findPaidOrderID(@Param("orderID") Integer orderID);
 
     List<CmPromotion> findPromotionsByIds(@Param("promotionsIds") Set promotionsIds);
 
@@ -39,19 +39,29 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
 
     /**
      * 删除此订单下订单促销
+     *
      * @param orderId
      */
     void deleterPomotionsOrder(Integer orderId);
 
     /**
      * 更新订单付款状态和0成本标识
+     *
      * @param newOrder
      */
     void updateOrderStatus(NewOrder newOrder);
 
     /**
      * 获取上线协销人员，排除采美默认协销经理
+     *
      * @return ServiceProvider
      */
     List<NewCmSp> findServiceProviderList();
+
+    /**
+     * 修改订单返佣标识
+     *
+     * @param orderId
+     */
+    void updateByRebateFlag(Integer orderId);
 }

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

@@ -1948,5 +1948,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     public List<NewCmSp> findServiceProviderList() {
         return newOrderDao.findServiceProviderList();
     }
+
+    @Transactional(readOnly = false)
+    public void modifyRebate(Integer orderId) {
+        newOrderDao.updateByRebateFlag(orderId);
+    }
 }
 

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

@@ -2045,4 +2045,13 @@ public class NewOrderController extends BaseController {
         addMessage(redirectAttributes, "余额抵扣成功");
         return "redirect:" + Global.getAdminPath() + "/order/orderList";
     }
+
+    /**
+     * 转为返佣订单
+     */
+    @RequestMapping("modifyRebate")
+    public String modifyRebate(Integer orderId) {
+        newOrderService.modifyRebate(orderId);
+        return "redirect:" + Global.getAdminPath() + "/order/orderList";
+    }
 }

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -198,7 +198,8 @@ public class Product extends DataEntity<Product> {
     private String secondHandType;//二手商品分类，1二手仪器，2临期产品，3其他
     private String instrumentType;//二手仪器分类的类型，1轻光电、2重光电、3耗材配件(仅适用于二手仪器分类多个用英文逗号分分隔)
     private String editFlag;//编辑标记，1是编辑，其他都不是
-    private String source;  //信息来源 1网站 2小程序 3后台
+    private String source;  //信息来源 1网站 2小程序 3后台 4小程序-协销
+    private String dockingPeopleName; //对接人名称
 
 
     public String getProductIds() {
@@ -1836,4 +1837,12 @@ public class Product extends DataEntity<Product> {
     public void setProductIdStr(String productIdStr) {
         this.productIdStr = productIdStr;
     }
+
+    public String getDockingPeopleName() {
+        return dockingPeopleName;
+    }
+
+    public void setDockingPeopleName(String dockingPeopleName) {
+        this.dockingPeopleName = dockingPeopleName;
+    }
 }

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

@@ -794,4 +794,8 @@
 	<delete id="deleterPomotionsOrder">
 		DELETE FROM cm_promotions_order WHERE orderId = #{orderId}
 	</delete>
+
+	<update id="updateByRebateFlag">
+		UPDATE cm_order SET rebateFlag = 1 WHERE orderID = #{orderId}
+	</update>
 </mapper>

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

@@ -801,20 +801,12 @@
                 AND a.shopOrderNo like concat('%', #{shopOrderNo} ,'%')
             </if>
             and (co.confirmFlag = '1' or co.confirmFlag = '2')
-            <!--<if test="operatingMode == 1">
-                and co.status != 7
-            </if>-->
-            <choose>
-                <when test="operatingMode != null and operatingMode == '1'.toString()">
-                    and a.payStatus != 3
-                </when>
-                <when test="operatingMode != null and operatingMode == '2'.toString()">
-                    and a.payStatus != 1
-                </when>
-            </choose>
-            <if test="operatingMode != null and operatingMode == '1'.toString()">
-                and co.status != 7
-            </if>
+			<if test="operatingMode != null and operatingMode == '1'.toString()">
+				and a.payStatus != 3 and co.status NOT IN (6,7)
+			</if>
+			<if test="operatingMode != null and operatingMode == '2'.toString()">
+				and a.payStatus != 1 and co.status != 6
+			</if>
 			and co.delFlag = 0
 			and a.delFlag = 0
 			and a.shopOrderID not in (

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -155,6 +155,7 @@
 		cshd.brandName AS "otherBrandName",
 		cshd.publisher AS "publisher",
 		cshd.source AS "source",
+		cshd.dockingPeopleName AS "dockingPeopleName",
         cb.name as "brandName"
     </sql>
 

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

@@ -210,137 +210,139 @@
     <h5>关联订单</h5>
     <div class="receipt-order-form">
         <c:forEach items="${vo.orderInfos}" var="orderInfo">
-            <c:if test="${vo.receiptType == 3}">
-                <div class="receipt-suborder-title">
-                    <span class="font-blue"><label>子订单编号：</label><a
-                            href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.shopOrderNo}(${orderInfo.shopOrderID})</a></span>
+            <div class="receipt-order-form">
+                <c:if test="${vo.receiptType == 3}">
+                    <div class="receipt-suborder-title">
+                        <span class="font-blue"><label>子订单编号：</label><a
+                                href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.shopOrderNo}(${orderInfo.shopOrderID})</a></span>
+                        <span><label>订单金额：</label>¥<fmt:formatNumber
+                                value="${orderInfo.shopOrderAmount}"
+                                pattern="#0.00"/></span>
+                        <span><label>供应商：</label>${orderInfo.shopName}</span>
+                    </div>
+                </c:if>
+                <div class="receipt-order-row2">
+                    <span class="font-blue"><label>订单编号：</label><a
+                            href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.orderNo}（${orderInfo.orderID}）</a></span>
                     <span><label>订单金额：</label>¥<fmt:formatNumber
-                            value="${orderInfo.shopOrderAmount}"
+                            value="${orderInfo.orderAmount}"
                             pattern="#0.00"/></span>
-                    <span><label>供应商：</label>${orderInfo.shopName}</span>
-                </div>
-            </c:if>
-            <div class="receipt-order-row2">
-                <span class="font-blue"><label>订单编号：</label><a
-                        href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.orderNo}（${orderInfo.orderID}）</a></span>
-                <span><label>订单金额：</label>¥<fmt:formatNumber
-                        value="${orderInfo.orderAmount}"
-                        pattern="#0.00"/></span>
-                <span>
-                    <label>已收金额：</label>¥<fmt:formatNumber
-                        value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
-                        pattern="#0.00"/>
                     <span>
-								<c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
-                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
-                                        <label>抹平明细：</label>
-                                        <c:if test="${receiptRecord.confirmType eq 1}">
-                                            <c:if test="${vo.receiptOrderFlag}">
-                                                <font color="red">(一款多单:少收抹平金额未知)</font>
+                        <label>已收金额：</label>¥<fmt:formatNumber
+                            value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
+                            pattern="#0.00"/>
+                        <span>
+                                    <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
+                                        <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
+                                            <label>抹平明细：</label>
+                                            <c:if test="${receiptRecord.confirmType eq 1}">
+                                                <c:if test="${vo.receiptOrderFlag}">
+                                                    <font color="red">(一款多单:少收抹平金额未知)</font>
+                                                </c:if>
+                                                <c:if test="${!vo.receiptOrderFlag}">
+                                                    <font color="red">(少收抹平:
+                                                    ￥<fmt:formatNumber value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}" pattern="#0.00"/>元)
+                                                    </font>
+                                                </c:if>
                                             </c:if>
-                                            <c:if test="${!vo.receiptOrderFlag}">
-                                                <font color="red">(少收抹平:
-                                                ￥<fmt:formatNumber value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}" pattern="#0.00"/>元)
-                                                </font>
+                                            <c:if test="${receiptRecord.confirmType eq 2}">
+                                                <c:if test="${vo.receiptOrderFlag}">
+                                                    <font color="red">(一款多单:多收抹平金额未知)</font>
+                                                </c:if>
+                                                <c:if test="${!vo.receiptOrderFlag}">
+                                                    <font color="red">(多收抹平:
+                                                    ￥<fmt:formatNumber value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}" pattern="#0.00"/>元)
+                                                    </font>
+                                                </c:if>
+                                            </c:if>
+                                            <c:if test="${receiptRecord.confirmType eq 3}">
+                                                <c:if test="${vo.receiptOrderFlag}">
+                                                    <font color="red">(一款多单:多收退余额)</font>
+                                                </c:if>
+                                                <c:if test="${!vo.receiptOrderFlag}">
+                                                    <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
+                                                    ￥<fmt:formatNumber value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}" pattern="#0.00"/>元)
+                                                    </font>
+                                                </c:if>
                                             </c:if>
                                         </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 2}">
-                                            <c:if test="${vo.receiptOrderFlag}">
-                                                <font color="red">(一款多单:多收抹平金额未知)</font>
+                                    </c:forEach>
+                                </span>
+                            </span>
+                    <span><label>机构名称：</label>
+                                    <c:if test="${orderInfo.organizeID == 1}">
+                                        <span class="org-note">星范</span>
+                                    </c:if>
+                                        ${orderInfo.customerName}
+                        <c:if test="${orderInfo.organizeID == 3}">
+                            <em class="weishaIcon">维沙</em>
+                        </c:if>
+                                </span>
+                    <span><label>订单状态：</label>
+                                    <c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>
+                                    <c:if test="${orderInfo.receiptStatus == 2}">部分收款</c:if>
+                                    <c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
+                                </span>
+                            </div>
+                            <div class="receipt-order-row3">
+                                <span><label>订单类型：</label><c:if test="${orderInfo.orderType == 0}">协销订单</c:if>
+                                        <c:if test="${orderInfo.orderType == 1}">自主订单</c:if></span>
+                    <span><label>下单日期：</label>${orderInfo.orderTime}</span>
+                </div>
+                <div class="receipt-order-row4">
+                    <div><h5><label>订单收款记录：</label></h5></div>
+                    <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
+                        <div class="row4-wrapper">
+                            <span class="row4-order-no">${index.index + 1}、</span>
+                            <span class="row4-time">${receiptRecord.receiptTime}</span>
+                            <c:if test="${receiptRecord.payWay == 1}">
+                                <%--线上收款--%>
+                                <span>线上&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                <span>${receiptRecord.receiptAmount}</span>
+                                <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
+                            </c:if>
+                            <c:if test="${receiptRecord.payWay == 2}">
+                                <span>线下&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                                <span>${receiptRecord.receiptAmount}</span>
+                                <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
+                                    <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
+                                </c:if>
+                                <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
+                                    <span>${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})</span>
+                                </c:if>
+                            </c:if>
+                            <c:if test="${receiptRecord.payWay == 3}">
+                                <%--余额抵扣--%>
+                                <span><a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}" style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
+                                <span><a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}" style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
+                            </c:if>
+                            <span>
+    <%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
+                                <c:if test="${!vo.receiptOrderFlag}">
+                                        <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
+                                            <label>抹平明细：</label>
+                                            <c:if test="${receiptRecord.confirmType eq 1}">
+                                                <font color="red">(少收抹平:
+                                                    ￥<fmt:formatNumber value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}" pattern="#0.00"/>元)
+                                                </font>
                                             </c:if>
-                                            <c:if test="${!vo.receiptOrderFlag}">
+                                            <c:if test="${receiptRecord.confirmType eq 2}">
                                                 <font color="red">(多收抹平:
-                                                ￥<fmt:formatNumber value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}" pattern="#0.00"/>元)
+                                                    ￥<fmt:formatNumber value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}" pattern="#0.00"/>元)
                                                 </font>
                                             </c:if>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 3}">
-                                            <c:if test="${vo.receiptOrderFlag}">
-                                                <font color="red">(一款多单:多收退余额)</font>
-                                            </c:if>
-                                            <c:if test="${!vo.receiptOrderFlag}">
+                                            <c:if test="${receiptRecord.confirmType eq 3}">
                                                 <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
-                                                ￥<fmt:formatNumber value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}" pattern="#0.00"/>元)
+                                                    ￥<fmt:formatNumber value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}" pattern="#0.00"/>元)
                                                 </font>
                                             </c:if>
                                         </c:if>
-                                    </c:if>
-                                </c:forEach>
-							</span>
-                        </span>
-                <span><label>机构名称：</label>
-								<c:if test="${orderInfo.organizeID == 1}">
-                                    <span class="org-note">星范</span>
                                 </c:if>
-									${orderInfo.customerName}
-                    <c:if test="${orderInfo.organizeID == 3}">
-                        <em class="weishaIcon">维沙</em>
-                    </c:if>
-							</span>
-                <span><label>订单状态：</label>
-								<c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>
-								<c:if test="${orderInfo.receiptStatus == 2}">部分收款</c:if>
-								<c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
-							</span>
-						</div>
-						<div class="receipt-order-row3">
-							<span><label>订单类型：</label><c:if test="${orderInfo.orderType == 0}">协销订单</c:if>
-									<c:if test="${orderInfo.orderType == 1}">自主订单</c:if></span>
-                <span><label>下单日期：</label>${orderInfo.orderTime}</span>
-            </div>
-            <div class="receipt-order-row4">
-                <div><h5><label>订单收款记录：</label></h5></div>
-                <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
-                    <div class="row4-wrapper">
-                        <span class="row4-order-no">${index.index + 1}、</span>
-                        <span class="row4-time">${receiptRecord.receiptTime}</span>
-                        <c:if test="${receiptRecord.payWay == 1}">
-                            <%--线上收款--%>
-                            <span>线上&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
-                            <span>${receiptRecord.receiptAmount}</span>
-                            <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
-                        </c:if>
-                        <c:if test="${receiptRecord.payWay == 2}">
-                            <span>线下&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
-                            <span>${receiptRecord.receiptAmount}</span>
-                            <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
-                                <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
-                            </c:if>
-                            <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
-                                <span>${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})</span>
-                            </c:if>
-                        </c:if>
-                        <c:if test="${receiptRecord.payWay == 3}">
-                            <%--余额抵扣--%>
-                            <span><a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}" style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
-                            <span><a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}" style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
-                        </c:if>
-                        <span>
-<%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
-                            <c:if test="${!vo.receiptOrderFlag}">
-                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
-                                        <label>抹平明细：</label>
-                                        <c:if test="${receiptRecord.confirmType eq 1}">
-                                            <font color="red">(少收抹平:
-                                                ￥<fmt:formatNumber value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}" pattern="#0.00"/>元)
-                                            </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 2}">
-                                            <font color="red">(多收抹平:
-                                                ￥<fmt:formatNumber value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}" pattern="#0.00"/>元)
-                                            </font>
-                                        </c:if>
-                                        <c:if test="${receiptRecord.confirmType eq 3}">
-                                            <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
-                                                ￥<fmt:formatNumber value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}" pattern="#0.00"/>元)
-                                            </font>
-                                        </c:if>
-                                    </c:if>
-                            </c:if>
-                            </span>
-                    </div>
-                </c:forEach>
-            </div>
+                                </span>
+                        </div>
+                    </c:forEach>
+                </div>
+            </div><br>
         </c:forEach>
         </c:if>
     </div>

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

@@ -20,8 +20,8 @@
 		.pay-table th{background:#f9f9f9}
 		.pay-table tr:first-child th{background:#eee !important}
 		.pay-table td{background:#fff !important}
-		/*.supplier-fee{text-align:left !important;padding-top:20px !important;padding-left:20px !important}*/
-		.need-to-pay{width:50px}
+		.check-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}
+		.check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}
 		.payment-form-bottom label{width:140px}
 		.used-amount{width:80px;margin-top:6px}
 		.process-details span{width:140px;margin-left:50px;font-weight:600}
@@ -362,6 +362,9 @@
 				</c:if>
 			</div>
 		</div>
+		<div class="check-btn">
+			<button class="apply-btn btn btn-primary" type="button" onclick="window.location.href='${ctx}/order/cmPayShop/printDetail?id=${cmPayShop.id}'">去打印</button>
+		</div>
 	</div>
 	<script>
 		(function(){

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

@@ -1071,6 +1071,9 @@
                             <a href="javascript:void(0);"
                                onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
                         </c:if>
+                        <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1}">
+                            <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}" onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
+                        </c:if>
                     </shiro:hasPermission>
 
                     <shiro:hasPermission name="order:order:applyrefound">

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

@@ -315,6 +315,9 @@
                         <a href="javascript:void(0);"
                            onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
                     </c:if>
+                    <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1}">
+                        <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}" onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
+                    </c:if>
                 </shiro:hasPermission>
                 <shiro:hasPermission name="order:order:applyrefound">
                     <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">

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

@@ -610,25 +610,31 @@
                     if (onSubmitBefor() == false) {
                         return;
                     }
-                    // 因为订单总额和应收订单金额都为0元，如果保存订单则状态直接为已付款！
-                    var payableAmount = $(".payableAmount").html();
-                    var payTotalFee = $(".payTotalFee").html();
-                    if(0 == payableAmount && 0 == payTotalFee ){
-                        top.$.jBox.confirm("该订单无须支付，保存后订单收款状态直接为“已收款”，且无需再确认订单",'保存订单提示',function(v,h,f){
-                                if(v=='ok'){
-                                    // 提交订单
-                                    loading('正在提交，请稍等...');
-                                    form.submit();
-                                }
-                            },{buttonsFocus:1, closed:function(){
-                                if (typeof closed == 'function') {
-                                    closed();
-                                }
-                            }});
-                    }else{
+                  top.$.jBox.confirm("请仔细确认订单是否为返佣订单后再提交订单", '提示', function (v, h, f) {
+                    if (v == true) {
+                      // 因为订单总额和应收订单金额都为0元，如果保存订单则状态直接为已付款！
+                      var payableAmount = $(".payableAmount").html();
+                      var payTotalFee = $(".payTotalFee").html();
+                      if (0 == payableAmount && 0 == payTotalFee) {
+                        top.$.jBox.confirm("该订单无须支付，保存后订单收款状态直接为“已收款”，且无需再确认订单", '保存订单提示', function (v, h, f) {
+                          if (v == 'ok') {
+                            // 提交订单
+                            loading('正在提交，请稍等...');
+                            form.submit();
+                          }
+                        }, {
+                          buttonsFocus: 1, closed: function () {
+                            if (typeof closed == 'function') {
+                              closed();
+                            }
+                          }
+                        });
+                      } else {
                         loading('正在提交，请稍等...');
                         form.submit();
+                      }
                     }
+                  }, {buttonsFocus: 1, persistent: true, buttons: {'继续提交': true, '再想一想': false}});
                 },
                 errorContainer: "#messageBox",
                 errorPlacement: function (error, element) {

src/main/webapp/WEB-INF/views/modules/product-new/secondHand.jsp

@@ -114,7 +114,8 @@
         <th>商品图片</th>
         <th>商品品牌</th>
         <th>商品名称</th>
-        <th>发布者</th>
+        <th>卖家</th>
+        <th>采美对接人</th>
         <th>来源</th>
         <th>市场价</th>
         <th>交易价</th>
@@ -163,8 +164,9 @@
 
             </td>
             <td>
-                    ${empty product.publisher?product.contactName:product.publisher}
+                    ${product.contactName}
             </td>
+            <td>${product.dockingPeopleName}</td>
             <td>
                 <c:if test="${product.source eq 1}">
                     网站
@@ -175,6 +177,9 @@
                 <c:if test="${product.source eq 3}">
                     后台
                 </c:if>
+                <c:if test="${product.source eq 4}">
+                    小程序-协销
+                </c:if>
             </td>
             <td>
                     <%--市场价为空不显示--%>

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -430,22 +430,10 @@
                         <a href="${ctx}/new/user/agency/operation?userOrganizeID=${newCmClubList.userOrganizeID}&clubID=${newCmClubList.clubID}&userID=${newCmClubList.userID}&name=${newCmClubList.name}">查看运营人员</a>
                     </c:if>
                     <c:if test="${newCmClubList.status eq 1 || newCmClubList.status eq 92}">
-<%--                        <a href="${ctx}/new/user/agency/form?id=${newCmClubList.clubID}&source=2&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}">审核</a>--%>
                         <a href="javascript:void(0);" onclick="toAudit(${newCmClubList.clubID},'${newCmClubList.userName}','${newCmClubList.bindMobile}')">审核</a>
                     </c:if>
-                        <%--<c:if test="${empty newCmClub.firstClubType}">
-                            &lt;%&ndash;不存在组织的用户为采美用户，只有采美用户才以下功能&ndash;%&gt;
-                            <c:if test="${newCmClub.userOrganizeID eq null or newCmClub.userOrganizeID eq 0}">
-                                <a href="javascript:void(0);" class="clubType" data-flag="0"
-                                   data-clubID="${newCmClubList.clubID}">设置分类</a>
-                            </c:if>
-                        </c:if>--%>
                     <a href="javascript:void(0);"
                        onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构类别</a>
-                        <%--<c:if test="${not empty newCmClub.firstClubType}">
-                            <a href="javascript:void(0);" class="clubType" data-value='${fns:toJson(newCmClub)}'
-                               data-flag="1" data-clubID="${newCmClub.clubID}">修改分类</a>
-                        </c:if>--%>
                 </td>
             </shiro:hasPermission>
         </tr>
@@ -946,6 +934,7 @@
                 + "               <label><input name='auditCheckBox' type='checkbox' value='营业执照错误'><span>营业执照错误</span></label>"
                 + "               <label><input name='auditCheckBox' type='checkbox' value='详细信息不全'><span>详细信息不全</span></label>"
                 + "               <label><input name='auditCheckBox' type='checkbox' value='机构名称敏感'><span>机构名称敏感</span></label>"
+                + "               <label><input name='auditCheckBox' type='checkbox' value='不符合平台要求'><span>不符合平台要求</span></label>"
                 + "           </div>"
                 + "       </div>"
                 + "       <div class='bd-row'>"