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

src/main/java/com/caimei/modules/coupon/web/CmCouponController.java

@@ -358,6 +358,7 @@ public class CmCouponController extends BaseController {
         List<Integer> clubIds = messageCenterDao.ClubIds();
 
 //        new Thread(() -> consumer(cmCoupon, clubIds)).start();
+        //等于空就是添加否则是修改
         if("".equals(cmCoupon.getId())){
         consumer(cmCoupon, clubIds);
         RedisLearn.producer(clubIds);

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

@@ -104,6 +104,9 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 if (l.getPayType().equals("7")) {
                     l.setPayBank("华夏银行2400");
                 }
+                if (l.getPayType().equals("8")) {
+                    l.setPayBank("中国银行9452");
+                }
             }
             //付款类型: 1子订单付款 2供应商差价 3付第三方
             if (l.getPaymentType() == 1) {

src/main/java/com/caimei/modules/order/utils/OrderUtil.java

@@ -344,6 +344,9 @@ public class OrderUtil {
         if ("22".equals(payType)) {
             return "华夏银行2400";
         }
+        if ("23".equals(payType)) {
+            return "中国银行9452";
+        }
         return "";
     }
 

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -343,6 +343,9 @@
                             <c:if test="${cmReturnedPurchase.payType == '7'}">
                                 华夏银行2400
                             </c:if>
+                            <c:if test="${cmReturnedPurchase.payType == '8'}">
+                                中国银行9452
+                            </c:if>
                         </c:if>
                         <c:if test="${empty cmReturnedPurchase.refundFee or cmReturnedPurchase.refundFee eq 0}">
                             暂无支付方式

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -272,6 +272,7 @@
                             <form:option value="5" label="广发银行5461"/>
                             <form:option value="6" label="虚拟银行0000"/>
                             <form:option value="7" label="华夏银行2400"/>
+                            <form:option value="8" label="中国银行9452"/>
                         </form:select>
                     </c:if>
                     <c:if test="${empty cmReturnedPurchase.refundFee or cmReturnedPurchase.refundFee eq 0}">

src/main/webapp/WEB-INF/views/modules/bulkpurchase/organizeOrderReturnRecord.jsp

@@ -356,6 +356,9 @@
                             <c:if test="${cmReturnedPurchase.payType == '7'}">
                                 华夏银行2400
                             </c:if>
+                            <c:if test="${cmReturnedPurchase.payType == '8'}">
+                                中国银行9452
+                            </c:if>
                         </c:if>
                         <c:if test="${empty cmReturnedPurchase.refundFee or cmReturnedPurchase.refundFee eq 0}">
                             暂无支付方式

src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp

@@ -402,6 +402,9 @@
                     <c:if test="${p.payType == '7'}">
                         华夏银行2400
                     </c:if>
+                    <c:if test="${p.payType == '8'}">
+                        中国银行9452
+                    </c:if>
                 </td>
                 <td>${p.payAmount}</td>
             </tr>

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

@@ -610,6 +610,7 @@
 						<option value="4">广发银行0115</option>
 						<option value="5">广发银行5461</option>
 						<option value="7">华夏银行2400</option>
+						<option value="8">中国银行9452</option>
 					</select>
 				</span>
             <label>付款时间：</label>

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

@@ -596,6 +596,7 @@
 						<option value="4">广发银行0115</option>
 						<option value="5">广发银行5461</option>
 						<option value="7">华夏银行2400</option>
+						<option value="8">中国银行9452</option>
 					</select>
 				</span>
             <label>付款时间：</label>

src/main/webapp/WEB-INF/views/modules/user/userBalanceWithdrawalsEdit.jsp

@@ -119,6 +119,7 @@
                     <form:option value="4" label="广发银行0115"/>
                     <form:option value="5" label="广发银行5461"/>
                     <form:option value="7" label="华夏银行2400"/>
+                    <form:option value="8" label="中国银行9452"/>
                 </form:select>
             </span>
             </div>

src/main/webapp/WEB-INF/views/modules/user/userBalanceWithdrawalsReview.jsp

@@ -112,6 +112,7 @@
 						<option value="4">广发银行0115</option>
 						<option value="5">广发银行5461</option>
 						<option value="7">华夏银行2400</option>
+						<option value="8">中国银行9452</option>
 					</select>
 				</span>
         </div>