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

src/main/java/com/caimei/modules/archive/entity/CmOrderArchive.java

@@ -14,7 +14,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
  * @version 2021-07-30
  */
 public class CmOrderArchive extends DataEntity<CmOrderArchive> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private String archiveNo;		// 资料编号
 	private String title;		// 资料标题
@@ -36,6 +36,8 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	 */
 	private String fileIds;
 
+	private String secondHandOrderFlag; // 二手商品订单标识  0非二手商品订单、 1二手商品订单
+
 
 	public CmOrderArchive() {
 		super();
@@ -53,7 +55,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setArchiveNo(String archiveNo) {
 		this.archiveNo = archiveNo;
 	}
-	
+
 	@Length(min=0, max=35, message="资料标题长度必须介于 0 和 35 之间")
 	public String getTitle() {
 		return title;
@@ -62,7 +64,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setTitle(String title) {
 		this.title = title;
 	}
-	
+
 	public Integer getShopOrderId() {
 		return shopOrderId;
 	}
@@ -70,7 +72,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setShopOrderId(Integer shopOrderId) {
 		this.shopOrderId = shopOrderId;
 	}
-	
+
 	@Length(min=0, max=55, message="供应商名称长度必须介于 0 和 55 之间")
 	public String getShopName() {
 		return shopName;
@@ -79,7 +81,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setShopName(String shopName) {
 		this.shopName = shopName;
 	}
-	
+
 	@Length(min=0, max=55, message="机构名称长度必须介于 0 和 55 之间")
 	public String getClubName() {
 		return clubName;
@@ -88,7 +90,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setClubName(String clubName) {
 		this.clubName = clubName;
 	}
-	
+
 	public String getTag() {
 		return tag;
 	}
@@ -96,7 +98,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setTag(String tag) {
 		this.tag = tag;
 	}
-	
+
 	public Integer getRebateFlag() {
 		return rebateFlag;
 	}
@@ -104,7 +106,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setRebateFlag(Integer rebateFlag) {
 		this.rebateFlag = rebateFlag;
 	}
-	
+
 	@Length(min=0, max=200, message="备注长度必须介于 0 和 200 之间")
 	public String getRemark() {
 		return remark;
@@ -113,7 +115,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getAddTime() {
 		return addTime;
@@ -162,4 +164,12 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setUpdateShopOrderIdFlag(Integer updateShopOrderIdFlag) {
 		this.updateShopOrderIdFlag = updateShopOrderIdFlag;
 	}
-}
+
+	public String getSecondHandOrderFlag() {
+		return secondHandOrderFlag;
+	}
+
+	public void setSecondHandOrderFlag(String secondHandOrderFlag) {
+		this.secondHandOrderFlag = secondHandOrderFlag;
+	}
+}

src/main/java/com/caimei/modules/cibe/entity/Shop.java

@@ -12,6 +12,9 @@ public class Shop extends DataEntity<Shop> {
 
 	private static final long serialVersionUID = 1L;
 	private String cardNumber;
+	private String accountType; // 账户类型
+	private String banOfDeposit; // 开户行
+	private String accountName;// 开户名
 	private Integer shopID; //
 	private Integer userID; //
 	private String name; //
@@ -103,6 +106,30 @@ public class Shop extends DataEntity<Shop> {
 		this.cardNumber = cardNumber;
 	}
 
+	public String getAccountType() {
+		return accountType;
+	}
+
+	public void setAccountType(String accountType) {
+		this.accountType = accountType;
+	}
+
+	public String getBanOfDeposit() {
+		return banOfDeposit;
+	}
+
+	public void setBanOfDeposit(String banOfDeposit) {
+		this.banOfDeposit = banOfDeposit;
+	}
+
+	public String getAccountName() {
+		return accountName;
+	}
+
+	public void setAccountName(String accountName) {
+		this.accountName = accountName;
+	}
+
 	public Integer getUserID() {
 		return userID;
 	}

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -101,6 +101,8 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private Double income;       //主订单总佣金
     private List<String> shopOrderNos;      //主订单下所有子订单
     private String shopName;            //供应商
+    private String contactName;         //二手商品联系人姓名
+    private String dockingPeopleName;   //二手商品采美接收人姓名
     private String commercialCode;      //分账方,子商户商编
     private String receiver;//收货人
     private String buyer;//买家
@@ -599,6 +601,23 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
         this.shopName = shopName;
     }
 
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getDockingPeopleName() {
+        return dockingPeopleName;
+    }
+
+    public void setDockingPeopleName(String dockingPeopleName) {
+        this.dockingPeopleName = dockingPeopleName;
+    }
+
     @Transient
     public String getReceiver() {
         return receiver;

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

@@ -27,6 +27,7 @@ import com.caimei.modules.product.dao.CmPromotionDao;
 import com.caimei.modules.product.dao.CmSecondHandDetailDao;
 import com.caimei.modules.product.dao.ProductDao;
 import com.caimei.modules.product.entity.CmPromotion;
+import com.caimei.modules.product.entity.CmSecondHandDetail;
 import com.caimei.modules.product.entity.OrderProductLadderPrice;
 import com.caimei.modules.product.entity.Product;
 import com.caimei.modules.user.dao.CmUserDao;
@@ -1307,6 +1308,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                         shopPromotion = cmPromotionDao.findOrderPromotions(shopOrder.getOrderPromotionsId());
                         shopOrder.setShopPromotion(shopPromotion);
                     }
+                    CmSecondHandDetail cmSecondHandDetail = cmSecondHandDetailDao.selectContactDockingPeople(shopOrder.getShopOrderNo());
+                    if (null != cmSecondHandDetail) {
+                        shopOrder.setContactName(cmSecondHandDetail.getContactName());
+                        shopOrder.setDockingPeopleName(cmSecondHandDetail.getDockingPeopleName());
+                    }
                 }
                 newOrder.setNewShopOrders(shopOrders);
             }

src/main/java/com/caimei/modules/product/dao/CmSecondHandDetailDao.java

@@ -36,4 +36,6 @@ public interface CmSecondHandDetailDao extends CrudDao<CmSecondHandDetail> {
     Integer findShopId(String cardNumber);
 
     Integer insertShop(Shop shopVo);
+
+    CmSecondHandDetail selectContactDockingPeople(String shopOrderNo);
 }

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

@@ -55,6 +55,9 @@ public class CmSecondHandDetail extends DataEntity<CmSecondHandDetail> {
     private List<Integer> fileTypes;
     private String splitCode;//商品分账号
     private String cardNumber; //银行卡号
+    private String accountType; // 账户类型
+    private String banOfDeposit; // 开户行
+    private String accountName;// 开户名
 
     private String validFlag;//商品状态，见表c_productstatus或枚举ProductStatus，0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已冻结
     private String productCategory;// 商品的类别：1正常商品(默认)，2二手商品
@@ -135,6 +138,30 @@ public class CmSecondHandDetail extends DataEntity<CmSecondHandDetail> {
         this.cardNumber = cardNumber;
     }
 
+    public String getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(String accountType) {
+        this.accountType = accountType;
+    }
+
+    public String getBanOfDeposit() {
+        return banOfDeposit;
+    }
+
+    public void setBanOfDeposit(String banOfDeposit) {
+        this.banOfDeposit = banOfDeposit;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
     public List<Integer> getFileTypes() {
         return fileTypes;
     }

src/main/java/com/caimei/modules/product/service/CmSecondHandDetailService.java

@@ -109,6 +109,15 @@ public class CmSecondHandDetailService extends CrudService<CmSecondHandDetailDao
             if (null != value.getCardNumber()) {
                 cmSecondHandDetail.setCardNumber(value.getCardNumber());
             }
+            if (null != value.getAccountType()) {
+                cmSecondHandDetail.setAccountType(value.getAccountType());
+            }
+            if (null != value.getBanOfDeposit()) {
+                cmSecondHandDetail.setBanOfDeposit(value.getBanOfDeposit());
+            }
+            if (null != value.getAccountName()) {
+                cmSecondHandDetail.setAccountName(value.getAccountName());
+            }
         }
     }
 

src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -312,6 +312,16 @@ public class CmSecondHandDetailController extends BaseController {
             shopVo.setLinkMan(cmSecondHandDetail.getContactName());
             shopVo.setContractMobile(cmSecondHandDetail.getContactMobile());
             shopVo.setCardNumber(cmSecondHandDetail.getCardNumber());
+            if (cmSecondHandDetail.getBanOfDeposit() != null) {
+                shopVo.setBanOfDeposit(cmSecondHandDetail.getBanOfDeposit());
+            }
+            if (cmSecondHandDetail.getAccountName() != null){
+                shopVo.setAccountName(cmSecondHandDetail.getAccountName());
+            }
+
+            if (cmSecondHandDetail.getAccountType()!= null) {
+                shopVo.setAccountType(cmSecondHandDetail.getAccountType());
+            }
             cmSecondHandDetailService.insertShop(shopVo);
             shopId = shopVo.getShopID();
         }
@@ -458,7 +468,7 @@ public class CmSecondHandDetailController extends BaseController {
             String imageUrl = getImageUrl(licenseImage);
             cmSecondHandDetail.setLicenseImage(imageUrl);
         }
-        cmSecondHandDetail.setAnnounType(2);
+//        cmSecondHandDetail.setAnnounType(2);
         // 保存二手详细信息
         cmSecondHandDetailService.save(cmSecondHandDetail);
         if(cmSecondHandDetail.getAnnounType()!=null && cmSecondHandDetail.getAnnounType()!=2) {

src/main/resources/mappings/modules/archive/CmOrderArchiveMapper.xml

@@ -32,7 +32,7 @@
 
     <select id="findList" resultType="CmOrderArchive">
         SELECT
-        <include refid="cmOrderArchiveColumns"/>,ifnull(b.fileNum,0) as fileNum
+        <include refid="cmOrderArchiveColumns"/>,ifnull(b.fileNum,0) as fileNum,co.secondHandOrderFlag as secondHandOrderFlag
         FROM cm_order_archive a
         <include refid="cmOrderArchiveJoins"/>
         left join (
@@ -88,6 +88,9 @@
                     </otherwise>
                 </choose>
             </if>
+        <if test="secondHandOrderFlag != null and secondHandOrderFlag != ''">
+            AND co.secondHandOrderFlag = #{secondHandOrderFlag}
+        </if>
         </where>
         group by a.id
         <choose>
@@ -241,4 +244,4 @@
         where id = #{fileId}
     </delete>
 
-</mapper>
+</mapper>

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

@@ -106,7 +106,10 @@
 			cshd.publishIdentity,
 			cshd.authenticationBackImage,
 			cshd.licenseImage,
-		    s.cardNumber
+		    s.cardNumber,
+		    s.accountType,
+		    s.banOfDeposit,
+		    s.accountName
 		from cm_second_hand_detail cshd
 		left join product p on cshd.productId = p.productId
 		left join shop s on s.shopID = p.shopID
@@ -209,9 +212,16 @@
 		values(#{secondId},#{productId},#{fileType})
 	</insert>
 	<insert id="insertShop" keyColumn="shopID" keyProperty="shopID" useGeneratedKeys="true">
-		insert into shop (name,linkMan,contractMobile,cardNumber,addTime,status,shopType)
-		values (#{name},#{linkMan},#{contractMobile},#{cardNumber},now(),90,3)
+		insert into shop (name,linkMan,contractMobile,cardNumber,accountType,banOfDeposit,accountName,addTime,status,shopType)
+		values (#{name},#{linkMan},#{contractMobile},#{cardNumber},#{accountType},#{banOfDeposit},#{accountName},now(),90,3)
 	</insert>
+	<select id="selectContactDockingPeople" resultType="CmSecondHandDetail">
+		select contactName,dockingPeopleName from cm_second_hand_detail
+		where productID IN (
+			SELECT p.productID FROM product AS p LEFT JOIN cm_order_product cop ON p.productID = cop.productID
+			WHERE cop.shopOrderNo = #{shopOrderNo}
+		)
+	</select>
 	<update id="update">
 		UPDATE cm_second_hand_detail SET
 			productID = #{productID},

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveList.jsp

@@ -76,13 +76,19 @@
         <label>商品标签：</label>
         <form:input path="tag" htmlEscape="false" class="input-medium"/>
         <label>订单状态：</label>
-        <form:select path="orderStatus" class="select-ele input-medium required">
+        <form:select path="orderStatus" class="select-ele input-medium required"  cssStyle="width: 177px">
             <form:option value="" label="所有"/>
             <form:options items="${fns:getDictList('order_status')}" itemLabel="label" itemValue="value"
                           htmlEscape="false"/>
         </form:select>
         <label>返佣订单：</label>
-        <form:select path="rebateFlag" class="input-medium">
+        <form:select path="rebateFlag" class="input-medium" cssStyle="width: 177px">
+            <form:option value="" label="请选择"/>
+            <form:option value="0" label="否"/>
+            <form:option value="1" label="是"/>
+        </form:select>
+        <label>二手订单：</label>
+        <form:select path="secondHandOrderFlag" class="input-medium" cssStyle="width: 177px">
             <form:option value="" label="请选择"/>
             <form:option value="0" label="否"/>
             <form:option value="1" label="是"/>
@@ -102,6 +108,7 @@
         <th>订单资料标题</th>
         <th>子订单ID/母订单ID</th>
         <th>母订单状态</th>
+        <th>二手订单</th>
         <th>供应商名称</th>
         <th>机构名称</th>
         <th>商品标签</th>
@@ -132,6 +139,9 @@
                 </c:if>
                 <c:if test="${cmOrderArchive.orderStatus eq 0 || cmOrderArchive.orderStatus eq 4 || cmOrderArchive.orderStatus eq 5 || cmOrderArchive.orderStatus eq 6 || cmOrderArchive.orderStatus eq 7}">${fns:getDictLabel(cmOrderArchive.orderStatus,"order_detail_status","" )}</c:if>
             </td>
+            <td>
+                    ${cmOrderArchive.secondHandOrderFlag eq 0?'否':(cmOrderArchive.secondHandOrderFlag eq 1?'是':'')}
+            </td>
             <td>
                     ${cmOrderArchive.shopName}
             </td>
@@ -159,4 +169,4 @@
 </table>
 <div class="pagination">${page}</div>
 </body>
-</html>
+</html>

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

@@ -81,36 +81,46 @@
                     //确定
                     var $jboxFrame = top.$('#jbox-iframe');
                     var $mainFrame = top.$('#mainFrame');
-                    if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-                        var items = $jboxFrame[0].contentWindow.getCheckedItems();
-                        console.log(items);
-                        if (items.productId == "") {
-                            if (items.image == '') {
-                                alertx("请上传图片");
-                                return false;
-                            }
-                            if (items.name == '') {
-                                alertx("请输入名称");
-                                return false;
-                            }
-                            if (items.link == '') {
-                                alertx("请输入跳转链接");
-                                return false;
-                            }
-                            if (items.sort == '') {
-                                alertx("请输入排序值");
-                                return false;
-                            }
-                            if (items.label == '') {
-                                alertx("请输入标签");
-                                return false;
-                            }
-                        }
-                        imageList.push(items);
+                    var $isCheckedAll = $jboxFrame[0].contentWindow.handleCheckedAll();
+                    if($isCheckedAll){
+                        var checkedAllList = $jboxFrame[0].contentWindow.handleClickAllSelect();
+                        imageList = imageList.concat(checkedAllList);
                         $('#contentTable').show();
                         $("#del").removeAttr("disabled");
                         batchSaveSort();
-                    }
+                    }else{
+                        if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
+                            var items = $jboxFrame[0].contentWindow.getCheckedItems();
+                            for (var i = 0; i < items.length; i++) {
+                                if (items[i].productId == "") {
+                                    if (items[i].image == '') {
+                                        alertx("请上传图片");
+                                        return false;
+                                    }
+                                    if (items[i].name == '') {
+                                        alertx("请输入名称");
+                                        return false;
+                                    }
+                                    if (items[i].link == '') {
+                                        alertx("请输入跳转链接");
+                                        return false;
+                                    }
+                                    if (items[i].sort == '') {
+                                        alertx("请输入排序值");
+                                        return false;
+                                    }
+                                    if (items[i].label == '') {
+                                        alertx("请输入标签");
+                                        return false;
+                                    }
+                                }
+                            }
+                            imageList = imageList.concat(items);
+                            $('#contentTable').show();
+                            $("#del").removeAttr("disabled");
+                            batchSaveSort();
+                        }
+                    };
                     return true;
                 }
             });
@@ -391,4 +401,4 @@
     </div>
 </form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/activityFloorContentForm.jsp

@@ -1319,29 +1319,31 @@
                         $('#productImageTable').hide();
                     } else {
                         //商品图片活动
-                        if (items.productId == "") {
-                            if (items.image == '') {
-                                alertx("请上传图片");
-                                return false;
-                            }
-                            if (items.name == '') {
-                                alertx("请输入名称");
-                                return false;
-                            }
-                            if (items.link == '') {
-                                alertx("请输入跳转链接");
-                                return false;
-                            }
-                            if (items.sort == '') {
-                                alertx("请输入排序值");
-                                return false;
-                            }
-                            if (items.label == '') {
-                                alertx("请输入标签");
-                                return false;
+                        for (var i = 0; i < items.length; i++) {
+                            if (items.productId == "") {
+                                if (items.image == '') {
+                                    alertx("请上传图片");
+                                    return false;
+                                }
+                                if (items.name == '') {
+                                    alertx("请输入名称");
+                                    return false;
+                                }
+                                if (items.link == '') {
+                                    alertx("请输入跳转链接");
+                                    return false;
+                                }
+                                if (items.sort == '') {
+                                    alertx("请输入排序值");
+                                    return false;
+                                }
+                                if (items.label == '') {
+                                    alertx("请输入标签");
+                                    return false;
+                                }
                             }
                         }
-                        productImageList.push(items);
+                        productImageList = productImageList.concat(items);
                         $('#adsImageTable').hide();
                         $('#infoImageTable').hide();
                         $('#productImageTable').show();
@@ -1795,4 +1797,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/addProductImage.jsp

@@ -67,7 +67,7 @@
 <sys:message content="${message}"/>
 <table class="table table-striped table-bordered table-condensed table-hover">
     <tr>
-        <th style="width:20px;"></th>
+        <th style="width:20px;"><input class="check-all" type="checkbox" onclick="handleClickAllSelect()"/> 全选 </th>
         <th>商品ID</th>
         <th>商品图片</th>
         <th>商品名称</th>
@@ -80,7 +80,7 @@
         <c:forEach items="${page.list}" var="item">
             <tr id="${item.productID}" class="itemtr">
                 <th>
-                    <input class="check-item" type="radio" name="info" value='${fns:toJson(item)}'/>
+                    <input class="check-item" type="checkbox" name="info" value='${fns:toJson(item)}'/>
                 </th>
                 <td>${item.productID}</td>
                 <td><img src="${item.mainImage}" width="50px" height="50px"></td>
@@ -98,6 +98,7 @@
 </c:if>
 <div class="pagination">${page}</div>
 <script type="text/javascript">
+    var isCheckedAll = false;
     $(document).ready(function () {
         //弹出框去滚动条
         top.$('#jbox-content').css("overflow-y", "hidden");
@@ -113,35 +114,79 @@
 
     function getCheckedItems() {
         var item = $('.check-item:checked').val();
-        var product = JSON.parse(item);
-        var link = '';
-        if (${productCategory eq 1}) {
-            link = "${fns:getConfig('wwwServer')}product-" + product.productID + ".html";
-        } else {
-            link = "${fns:getConfig('wwwServer')}flea-market-" + product.productID + ".html";
+        if(!item){
+            alertx("请勾选商品~");
+            return;
         }
+        var imageArray = [];
+        $(".check-item:checked").each(function (index,el) {
+            var item = $(this).val();
+            var product = JSON.parse(item);
+            var link = '';
+            if (${productCategory eq 1}) {
+                link = "${fns:getConfig('wwwServer')}product-" + product.productID + ".html";
+            } else {
+                link = "${fns:getConfig('wwwServer')}flea-market-" + product.productID + ".html";
+            }
 
-        var items = {
-            "id": "",
-            "productId": product.productID,
-            "validFlag": product.validFlag,
-            "image": product.mainImage,
-            "name": product.name,
-            "link": link,
-            "sort": 1,
-            "pcStatus": "1",
-            "appletsStatus": "1",
-            "label": "",
-            "createDate": ""
-        };
-        return items;
+            var items = {
+                "id": "",
+                "productId": product.productID,
+                "validFlag": product.validFlag,
+                "image": product.mainImage,
+                "name": product.name,
+                "link": link,
+                "sort": 1,
+                "pcStatus": "1",
+                "appletsStatus": "1",
+                "label": "",
+                "createDate": ""
+            };
+            imageArray.push(items);
+        })
+        return imageArray;
     }
-
-    function clickAllSelect(ckb) {
-        var isChecked = ckb.checked;
-        $(".check-item").attr('checked', isChecked);
+    function handleClickAllSelect() {
+        var inputIsCheckedAll = $('.check-all').attr('checked');
+        var imageArray = [];
+        if(inputIsCheckedAll){
+            isCheckedAll = true;
+            $(".check-item").attr('checked', true);
+            $(".check-item").each(function (index,el) {
+                var item = $(this).val();
+                var product = JSON.parse(item);
+                var link ='';
+                if (${productCategory eq 1}) {
+                    link = "${fns:getConfig('wwwServer')}product-" + product.productID + ".html";
+                } else {
+                    link = "${fns:getConfig('wwwServer')}flea-market-" + product.productID + ".html";
+                }
+                var items = {
+                    "id": "",
+                    "productId": product.productID,
+                    "validFlag": product.validFlag,
+                    "image": product.mainImage,
+                    "name": product.name,
+                    "link": link,
+                    "sort": 1,
+                    "pcStatus": "1",
+                    "appletsStatus": "1",
+                    "label": "",
+                    "createDate": ""
+                };
+                imageArray.push(items);
+            })
+        }else{
+            isCheckedAll = false;
+            $(".check-item").attr('checked', false);
+            imageArray = [];
+        }
+        return imageArray;
     }
-
+    function handleCheckedAll() {
+        return isCheckedAll;
+    }
+    /**
     /**
      * @param obj
      * jquery控制input只能输入数字

src/main/webapp/WEB-INF/views/modules/newhome/beautyFloorContentForm.jsp

@@ -1646,29 +1646,32 @@
                         $('#productImageTable').hide();
                     } else {
                         //商品图片活动
-                        if (items.productId == "") {
-                            if (items.image == '') {
-                                alertx("请上传图片");
-                                return false;
-                            }
-                            if (items.name == '') {
-                                alertx("请输入名称");
-                                return false;
-                            }
-                            if (items.link == '') {
-                                alertx("请输入跳转链接");
-                                return false;
-                            }
-                            if (items.sort == '') {
-                                alertx("请输入排序值");
-                                return false;
-                            }
-                            if (items.label == '') {
-                                alertx("请输入标签");
-                                return false;
+                        for (var i = 0; i < items.length; i++) {
+                            console.log('**-*-**'+items)
+                            if (items.productId == "") {
+                                if (items.image == '') {
+                                    alertx("请上传图片");
+                                    return false;
+                                }
+                                if (items.name == '') {
+                                    alertx("请输入名称");
+                                    return false;
+                                }
+                                if (items.link == '') {
+                                    alertx("请输入跳转链接");
+                                    return false;
+                                }
+                                if (items.sort == '') {
+                                    alertx("请输入排序值");
+                                    return false;
+                                }
+                                if (items.label == '') {
+                                    alertx("请输入标签");
+                                    return false;
+                                }
                             }
                         }
-                        productImageList.push(items);
+                        productImageList = productImageList.concat(items);
                         $('#adsImageTable').hide();
                         $('#infoImageTable').hide();
                         $('#productImageTable').show();
@@ -2162,4 +2165,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorContentForm.jsp

@@ -504,7 +504,7 @@
         top.$.jBox("iframe:" + url + "&productIds=" + productIds, {
             iframeScrolling: 'yes',
             width: $(top.document).width() - 400,
-            height: $(top.document).height() - 160,
+            height: $(top.document).height() - 100,
             persistent: true,
             title: title,
             buttons: {"确定": '1', "取消": '-1'},
@@ -512,36 +512,46 @@
                 //确定
                 var $jboxFrame = top.$('#jbox-iframe');
                 var $mainFrame = top.$('#mainFrame');
-                if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-                    var items = $jboxFrame[0].contentWindow.getCheckedItems();
-                    console.log(items);
-                    if (items.productId == "") {
-                        if (items.image == '') {
-                            alertx("请上传图片");
-                            return false;
-                        }
-                        if (items.name == '') {
-                            alertx("请输入名称");
-                            return false;
-                        }
-                        if (items.link == '') {
-                            alertx("请输入跳转链接");
-                            return false;
-                        }
-                        if (items.sort == '') {
-                            alertx("请输入排序值");
-                            return false;
-                        }
-                        if (items.label == '') {
-                            alertx("请输入标签");
-                            return false;
-                        }
-                    }
-                    imageList.push(items);
+                var $isCheckedAll = $jboxFrame[0].contentWindow.handleCheckedAll();
+                if($isCheckedAll){
+                    var checkedAllList = $jboxFrame[0].contentWindow.handleClickAllSelect();
+                    imageList = imageList.concat(checkedAllList);
                     $('#contentTable').show();
                     $("#del").removeAttr("disabled");
                     batchSaveSort();
-                }
+                }else{
+                    if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
+                        var items = $jboxFrame[0].contentWindow.getCheckedItems();
+                        for (var i = 0; i < items.length; i++) {
+                            if (items[i].productId == "") {
+                                if (items[i].image == '') {
+                                    alertx("请上传图片");
+                                    return false;
+                                }
+                                if (items[i].name == '') {
+                                    alertx("请输入名称");
+                                    return false;
+                                }
+                                if (items[i].link == '') {
+                                    alertx("请输入跳转链接");
+                                    return false;
+                                }
+                                if (items[i].sort == '') {
+                                    alertx("请输入排序值");
+                                    return false;
+                                }
+                                if (items[i].label == '') {
+                                    alertx("请输入标签");
+                                    return false;
+                                }
+                            }
+                        }
+                        imageList = imageList.concat(items);
+                        $('#contentTable').show();
+                        $("#del").removeAttr("disabled");
+                        batchSaveSort();
+                    }
+                };
                 return true;
             }
         });
@@ -756,4 +766,4 @@
     }
 </script>
 </body>
-</html>
+</html>

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

@@ -106,6 +106,7 @@
 <body>
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/order/cmDiscernReceipt/">收款列表</a></li>
+<%--    <li class="active tab-li"><a href="${ctx}/order/cmCollectionConfigureList">线下收款账号配置</a></li>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="cmDiscernReceipt" action="${ctx}/order/cmDiscernReceipt/" method="post"
            class="breadcrumb form-search">

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

@@ -910,6 +910,12 @@
     </div>
     <div class="order-rows">
         <span><label>供应商：</label>${shopOrder.shopName}</span>
+        <c:if test="${shopOrder.contactName ne null}">
+            <span><label>供应商联系人：</label>${shopOrder.contactName}</span>
+        </c:if>
+        <c:if test="${shopOrder.dockingPeopleName ne null}">
+            <span><label>采美对接人：</label>${shopOrder.dockingPeopleName}</span>
+        </c:if>
         <c:if test="${shopOrder.shopPromotion ne null && shopOrder.shopPromotion.type eq 3}">
             <c:if test="${shopOrder.shopPromotion.mode eq 2}">
                 <span><label

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

@@ -501,7 +501,7 @@
             <input type="checkbox" name="ids" class="findGroup" id="yqbg"
                    value="4" style="zoom: 150%">
             <span style="font-size: 15px;">仪器报关单</span>
-            <input type="checkbox" name="ids" class="findGroup" id="wrh"
+            <input type="checkbox" name="ids" class="findGroup" id="wrh" onclick="checkboxTrue()"
                    value="5" style="zoom: 150%">
             <span style="font-size: 15px;">无任何文件</span>
         </div>
@@ -519,9 +519,32 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label"><font color="red">*</font>收款卡号：<font color="red">（用于接收最终结算金额）</font></label>
+        <label class="control-label">开户名：</label>
+        <div class="controls">
+            <form:input path="accountName" htmlEscape="false" maxlength="11" class="input-xlarge"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>收款卡号：</label>
         <div class="controls">
             <form:input path="cardNumber" htmlEscape="false" type="number" maxlength="20" class="input-xlarge required"/>
+            <font color="red">（用于接收最终结算金额）</font>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">开户行：</label>
+        <div class="controls">
+            <form:input path="banOfDeposit" htmlEscape="false" maxlength="11" class="input-xlarge"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">账户类型：</label>
+        <div class="controls">
+            <form:select path="accountType" class="input-xlarge">
+                <form:option value="">请选择</form:option>
+                <form:option value="私账">私账</form:option>
+                <form:option value="公账">公账</form:option>
+            </form:select>
         </div>
     </div>
     <div class="control-group">
@@ -673,8 +696,9 @@
         <label class="control-label">二手出让承诺函图片：</label>
         <div class="controls upload-content-image iconBox">
             <div class="conList">
-                <form:hidden id="commitmentImage" path="commitmentImage" htmlEscape="false" maxlength="255"
-                             class="input-xlarge"/>
+                <form:hidden id="commitmentImage" path="commitmentImage"
+                             value="${cmSecondHandDetail.commitmentImage}"
+                             htmlEscape="false" maxlength="255" class="input-xlarge"/>
                 <sys:ckfinder input="commitmentImage" type="images" uploadPath="/photo" selectMultiple="false"
                               maxWidth="100"
                               maxHeight="100"/>
@@ -723,7 +747,7 @@
     </div>
 </form:form>
 <script>
-    debugger
+    // debugger
     $(function () {
             // 加载地址
             loadProvince();
@@ -926,36 +950,39 @@
                 })
             }, 500);
         });
-
-
         $('.upload-content-image .conList .btn:nth-of-type(1)').html('<div><span>+</span><h5>选择图片</h5></div>');
         $('.upload-content-image .conList .btn:nth-of-type(2)').after('<img class="cancel-upload-image" src="/static/images/close-btn1.png">').remove();
         $('.upload-content-image .conList').find('.cancel-upload-image').hide();
         var observeEleImage = document.getElementsByClassName('upload-content-image')[0];
         var observeEleImage1 = document.getElementsByClassName('upload-content-image')[1];
+        var observeEleImage2 = document.getElementsByClassName('upload-content-image')[2];
         var MutationObserverImage = window.MutationObserver || window.WebKitMutationObserver;
         var MutationObserverConfigImage = {
             childList: true,
             subtree: true,
             characterData: true
         };
-        var observerImage = new MutationObserverImage(function (mutations) {
-            $.each(mutations, function (index, item) {
-                if (item.type === 'childList') {
-                    // 在创建新的 element 时调用
-                    var target = $(item.target),
-                        thisWrapper = target.closest('.conList'),
-                        nextEle = thisWrapper.next();
-                    thisWrapper.find('li').css('z-index', 99);
-                    thisWrapper.find('.cancel-upload-image').show();
-                    if (nextEle.hasClass('hide-pic-image')) {
-                        nextEle.removeClass('hide-pic-image');
+        $('.upload-content-image').each(function (index, el){
+            console.log($(el))
+            var observerImage = new MutationObserverImage(function (mutations) {
+                $.each(mutations, function (index, item) {
+                    if (item.type === 'childList') {
+                        // 在创建新的 element 时调用
+                        var target = $(item.target),
+                            thisWrapper = target.closest('.conList'),
+                            nextEle = thisWrapper.next();
+                        thisWrapper.find('li').css('z-index', 99);
+                        thisWrapper.find('.cancel-upload-image').show();
+                        if (nextEle.hasClass('hide-pic-image')) {
+                            nextEle.removeClass('hide-pic-image');
+                        }
                     }
-                }
-            })
-        });
-        observerImage.observe(observeEleImage, MutationObserverConfigImage);
-        observerImage.observe(observeEleImage1, MutationObserverConfigImage);
+                })
+            });
+            observerImage.observe(observeEleImage, MutationObserverConfigImage);
+            observerImage.observe(observeEleImage1, MutationObserverConfigImage);
+            observerImage.observe(observeEleImage2, MutationObserverConfigImage);
+        })
 
         $('body').on('click', '.upload-content-image li', function () {
             var index = $(this).closest('.conList').index() + 1,
@@ -996,7 +1023,7 @@
                     input.parents(".conList").find(".cancel-upload-image").show();
                     input.parents(".conList").next().removeClass("hide-pic-image")
                 }
-                input = $("#commitmentImage");
+                var input = $("#commitmentImage");
                 if (input.val()) {
                     input.next().find("li").css("z-index", "99");
                     input.parents(".conList").find(".cancel-upload-image").show();
@@ -1279,6 +1306,34 @@
                 $(".costPropShow").show();
             }
         }
+        // 选择商品包含文件验证
+        function checkboxTrue() {
+
+            var idsTF = $('#wrh').is(':checked')
+            if (idsTF == true) {
+                $("#yqht").attr("checked", false);
+                $("#yqzc").attr("checked", false);
+                $("#yqfp").attr("checked", false);
+                $("#yqbg").attr("checked", false);
+            }
+            if (idsTF == true) {
+                $("#yqht").attr("disabled", true);
+                $("#yqzc").attr("disabled", true);
+                $("#yqfp").attr("disabled", true);
+                $("#yqbg").attr("disabled", true);
+            } else {
+                $("#yqht").attr("disabled", false);
+                $("#yqzc").attr("disabled", false);
+                $("#yqfp").attr("disabled", false);
+                $("#yqbg").attr("disabled", false);
+            }
+        }
+
+        // 获取二手出让承诺函图片名称
+        function fileName() {
+            var input = $('#fileName')
+            input.addEventListener('change',readFile,false)
+        }
 
 
     </script>