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

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

@@ -71,7 +71,7 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     void updatePayShopAmount(NewShopOrder shopOrder);
 
-    List<NewShopOrder> findByShopOrderIDs(@Param("shopOrderIDs") List<String> shopOrderIDs);
+    List<NewShopOrder> findByShopOrderIDs(@Param("shopOrderIDs") List<String> shopOrderIDs, @Param("payShopId") String payShopId);
 
     void updatePaying(@Param("shopOrderID") String shopOrderID, @Param("paying") String paying);
 

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

@@ -425,7 +425,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
             List<String> ids = payRecords.stream().map(CmPayShopRecord::getShopOrderID).collect(Collectors.toList());
             List<NewShopOrder> csos = new ArrayList<>();
             if (null != ids && ids.size() > 0) {
-                csos = newShopOrderDao.findByShopOrderIDs(ids);
+                csos = newShopOrderDao.findByShopOrderIDs(ids,cmPayShop.getId());
             }
             for (NewShopOrder so : csos) {
                 CmPayShopRecord cmPayShopRecord = payRecords.stream().filter(p -> p.getShopOrderID().equals(so.getShopOrderID().toString())).findAny().get();

src/main/resources/mappings/modules/landing/CmBrandLandingMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectCmBrandLandingList" parameterType="CmBrandLanding" resultMap="CmBrandLandingResult">
-        <include refid="selectCmBrandLandingVo"/>,
+        <include refid="selectCmBrandLandingVo"/>
         <if test="statisticsType != null  and statisticsType != ''">
             ,IFNULL((select sum(c.pv) from cm_praise_statistics c where  c.delFlag = 0 and c.type = #{statisticsType} and a.id = c.authorId  <if test="startPvCreateTime != null ">AND c.createTime >= #{startPvCreateTime} </if><if test="endPvCreateTime != null ">AND c.createTime <![CDATA[ <= ]]> #{endPvCreateTime} </if>), 0) as pv
         </if>

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

@@ -274,37 +274,39 @@
 
     <update id="applyCompileSave" parameterType="com.caimei.modules.order.entity.CmPayShop">
         UPDATE cm_pay_shop
-        SET
-        <if test="payType != null and payType !=''">
-            payType = #{payType},
-        </if>
-        <if test="payTime != null and payTime !=''">
-            payTime = #{payTime},
-        </if>
-        <if test="cmOtherPayType != null and cmOtherPayType !=''">
-            cmOtherPayType = #{cmOtherPayType},
-        </if>
-        <if test="cmOtherPayTime != null and cmOtherPayTime !=''">
-            cmOtherPayTime = #{cmOtherPayTime}
-        </if>
+        <set>
+            <if test="payType != null and payType !=''">
+                payType = #{payType},
+            </if>
+            <if test="payTime != null and payTime !=''">
+                payTime = #{payTime},
+            </if>
+            <if test="cmOtherPayType != null and cmOtherPayType !=''">
+                cmOtherPayType = #{cmOtherPayType},
+            </if>
+            <if test="cmOtherPayTime != null and cmOtherPayTime !=''">
+                cmOtherPayTime = #{cmOtherPayTime}
+            </if>
+        </set>
         WHERE id = #{id}
     </update>
 
     <update id="applyCompileRecordSave">
         update cm_pay_shop_record
-        SET
-        <if test="payType != null and payType !=''">
-            payType = #{payType},
-        </if>
-        <if test="payTime != null and payTime !=''">
-            payTime = #{payTime},
-        </if>
-        <if test="cmOtherPayType != null and cmOtherPayType !=''">
-            cmOtherPayType = #{cmOtherPayType},
-        </if>
-        <if test="cmOtherPayTime != null and cmOtherPayTime !=''">
-            cmOtherPayTime = #{cmOtherPayTime}
-        </if>
+        <set>
+            <if test="payType != null and payType !=''">
+                payType = #{payType},
+            </if>
+            <if test="payTime != null and payTime !=''">
+                payTime = #{payTime},
+            </if>
+            <if test="cmOtherPayType != null and cmOtherPayType !=''">
+                cmOtherPayType = #{cmOtherPayType},
+            </if>
+            <if test="cmOtherPayTime != null and cmOtherPayTime !=''">
+                cmOtherPayTime = #{cmOtherPayTime}
+            </if>
+        </set>
         WHERE payShopID = #{id}
     </update>
 

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

@@ -1243,6 +1243,10 @@
                 #{shopOrderID}
             </foreach>
         </if>
+        <if test="payShopId != null and payShopId != ''">
+            and cpsr.payShopId = #{payShopId}
+        </if>
+        group by a.shopOrderID
     </select>
 
     <update id="updatePaying">

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageActivityForm.jsp

@@ -110,7 +110,7 @@
         <div class="controls">
             <form:select path="backgroundType" class="input-xlarge " id="selectBgType">
                 <form:option value="" label="请选择"/>
-                <form:options items="${fns:getDictList('backgroundType')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('backgroundType')[0]}"/>
+                <form:options items="${fns:getDictList('backgroundType')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>
@@ -130,7 +130,7 @@
         <label class="control-label">背景图显示：</label>
         <div class="controls">
             <form:select path="backgroundImageWay" class="input-xlarge ">
-                <form:options items="${fns:getDictList('backgroundImageWay')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('backgroundImageWay')[0]}"/>
+                <form:options items="${fns:getDictList('backgroundImageWay')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>

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

@@ -232,12 +232,12 @@
             </td>
             <td>
                 <c:forEach items="${cmPayShop.shopOrders}" var="shopOrder">
-                    <a href="${ctx}/order/detail?id=${shopOrder.orderID}">${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</a><br>
+                    <a href="${ctx}/shopOrder/detail?id=${shopOrder.shopOrderID}">${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</a><br>
                 </c:forEach>
             </td>
             <td>
                 <c:forEach items="${cmPayShop.shopOrders}" var="shopOrder">
-                    <a href="${ctx}/order/detail?id=${shopOrder.orderID}">${shopOrder.orderNo}(${shopOrder.orderID})</a><br>
+                    <a href="${ctx}/shopOrder/detail?id=${shopOrder.shopOrderID}">${shopOrder.orderNo}(${shopOrder.orderID})</a><br>
                 </c:forEach>
             </td>
             <td>

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

@@ -572,6 +572,21 @@
                 <label>第三方中介费：</label>
                 <span>${cmPayShop.shopOrders[0].shopOtherFee}</span>
             </div>
+            <div>
+                <label><em class="required">* </em>付款账号：</label>
+                <c:if test="${cmPayShop.payType eq '6'}">
+                    无
+                </c:if>
+                <c:if test="${cmPayShop.payType ne '6'}">
+                    <span>户名：${cmPayShop.bankAccountName}</span>
+                    <span>账号：${cmPayShop.bankAccount}</span>
+                    <span>开户行：${cmPayShop.bankName}</span>
+                    <span>账户类型：
+        						<c:if test="${cmPayShop.type == '0'}">公帐</c:if>
+        						<c:if test="${cmPayShop.type == '1'}">私帐</c:if>
+        					</span>
+                </c:if>
+            </div>
             <c:if test="${cmPayShop.payType ne '6'}">
                 <div>
                     <label style="font-weight: bold; font-size:18px">转账支付：</label>
@@ -599,6 +614,21 @@
                 <label>采美中介费：</label>
                 <span>${cmPayShop.shopOrders[0].cmShopOtherFee}</span>
             </div>
+            <div>
+                <label><em class="required">* </em>付款账号：</label>
+                <c:if test="${cmPayShop.cmOtherPayType eq '6'}">
+                    无
+                </c:if>
+                <c:if test="${cmPayShop.cmOtherPayType ne '6'}">
+                    <span>户名：${cmPayShop.cmBankAccountName}</span>
+                    <span>账号：${cmPayShop.cmBankAccount}</span>
+                    <span>开户行：${cmPayShop.cmBankName}</span>
+                    <span>账户类型：
+        						<c:if test="${cmPayShop.cmType == '0'}">公帐</c:if>
+        						<c:if test="${cmPayShop.cmType == '1'}">私帐</c:if>
+        					</span>
+                </c:if>
+            </div>
             <div>
                 <label style="font-weight: bold; font-size:18px">转账支付：</label>
                 <span id="" style="font-weight: bold; font-size:18px">