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

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

@@ -27,6 +27,7 @@ import com.thinkgem.jeesite.common.utils.Encodes;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.modules.sys.entity.User;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,6 +46,7 @@ import java.util.stream.Collectors;
  * @author lwt
  * @version 2019-07-01
  */
+@Slf4j
 @Service
 @Transactional(readOnly = true)
 public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {

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

@@ -709,7 +709,7 @@
         }
 
         $('.check-cfm-btn').on('click',function(e) {
-            var payType = $('select[path="payType"]').val(),
+            var payType = $('select[name="payType"]').val(),
                 id = $('#id').val();
             if($(this).hasClass('check-blue-btn')) {
                 var textareaVal = $('#refuse-reasn').val();

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

@@ -78,7 +78,7 @@
         </div>
         <div>
             <label>付款银行：</label><span>
-					 <select path="payType" class="input-medium required" style="width: 200px">
+					 <select name="payType" class="input-medium required" style="width: 200px">
                          <option value="">请选择</option>
                          <c:forEach  items="${offlineCollections}" var="offlineCollections" varStatus="index">
                              <option value="${offlineCollections.type}">${offlineCollections.bankAccount}</option>