bugfix

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

@@ -569,8 +569,9 @@ public class NewOrderController extends BaseController {
         if (CollectionUtils.isNotEmpty(orderProduct) && orderProduct.size() > 0) {
             for (NewOrderProduct op : orderProduct) {
                 String isActProduct = op.getIsActProduct();
-                //活动商品和阶梯商品不写入价格库
-                if (StringUtil.equals("0", isActProduct)) {
+                Integer svipPriceFlag = op.getSvipPriceFlag();
+                //活动商品和阶梯商品和超级会员价不写入价格库
+                if (StringUtil.equals("0", isActProduct) && 0 == svipPriceFlag) {
                     String buyAgainFlag = op.getBuyAgainFlag();
                     //对于可以复购的商品添加买家商品价格，提供再次购买商品使用（如果不存在没有改买家商品价格则不能购买该商品）
                     if (StringUtils.isNotEmpty(buyAgainFlag) && StringUtils.equals("1", buyAgainFlag)) {

src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java

@@ -1,6 +1,8 @@
 package com.caimei.modules.user.dao;
 
+import com.caimei.modules.user.entity.CmClubRemarks;
 import com.caimei.modules.user.entity.NewCmClub;
+import com.caimei.modules.user.entity.RemarksFileVo;
 import com.caimei.modules.user.entity.UserBeansHistory;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
@@ -26,4 +28,10 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
     void insertBeansHistory(UserBeansHistory beansHistory);
 
     void updateByStatus(@Param("clubStatus") int clubStatus, @Param("confirmUserId") Integer confirmUserId);
+
+    List<CmClubRemarks> findRemarksList(CmClubRemarks cmClubRemarks);
+
+    List<String> getRemarksImageList(Integer remarksId);
+
+    List<RemarksFileVo> getRemarksFileList(Integer remarksId);
 }

src/main/java/com/caimei/modules/user/entity/CmClubRemarks.java

@@ -0,0 +1,115 @@
+package com.caimei.modules.user.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+import java.beans.Transient;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 机构资料备注
+ *
+ * @author Aslee
+ * @version 2021-10-21
+ */
+public class CmClubRemarks extends DataEntity<CmClubRemarks> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构id
+     */
+    private Integer clubId;
+
+    /**
+     * 备注id
+     */
+    private Integer remarksId;
+
+    /**
+     *
+     */
+    private String spName;
+
+    /**
+     * 文字备注
+     */
+    private String remarks;
+    /**
+     * 添加时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date addTime;
+
+    /**
+     * 图片列表
+     */
+    private List<String> imageList;
+
+    /**
+     * 文件列表
+     */
+    private List<RemarksFileVo> fileList;
+
+
+    public Integer getRemarksId() {
+        return remarksId;
+    }
+
+    public void setRemarksId(Integer remarksId) {
+        this.remarksId = remarksId;
+    }
+
+    @Override
+    public String getRemarks() {
+        return remarks;
+    }
+
+    @Override
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public List<String> getImageList() {
+        return imageList;
+    }
+
+    public void setImageList(List<String> imageList) {
+        this.imageList = imageList;
+    }
+
+    public List<RemarksFileVo> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<RemarksFileVo> fileList) {
+        this.fileList = fileList;
+    }
+
+    public Integer getClubId() {
+        return clubId;
+    }
+
+    public void setClubId(Integer clubId) {
+        this.clubId = clubId;
+    }
+
+    public String getSpName() {
+        return spName;
+    }
+
+    public void setSpName(String spName) {
+        this.spName = spName;
+    }
+}

src/main/java/com/caimei/modules/user/entity/NewCmClub.java

@@ -126,6 +126,7 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String startTime;     //注册时间开始 查询条件
     private String endTime;        //注册时间结束  查询条件
     private String userIdentity;  //用户身份
+    private Integer svipUserFlag;   //超级会员用户标识，1是，2不是
 
     public String getUserIdentity() {
         return userIdentity;
@@ -1024,4 +1025,12 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     public void setSource(String source) {
         this.source = source;
     }
+
+    public Integer getSvipUserFlag() {
+        return svipUserFlag;
+    }
+
+    public void setSvipUserFlag(Integer svipUserFlag) {
+        this.svipUserFlag = svipUserFlag;
+    }
 }

src/main/java/com/caimei/modules/user/entity/RemarksFileVo.java

@@ -0,0 +1,53 @@
+package com.caimei.modules.user.entity;
+
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Aslee
+ * @date : 2021/9/26
+ */
+public class RemarksFileVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * oss名称
+     */
+    private String ossName;
+
+    /**
+     * 文件链接
+     */
+    private String fileUrl;
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getOssName() {
+        return ossName;
+    }
+
+    public void setOssName(String ossName) {
+        this.ossName = ossName;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+}

src/main/java/com/caimei/modules/user/service/NewCmClubService.java

@@ -1,7 +1,12 @@
 package com.caimei.modules.user.service;
 
+import java.io.IOException;
 import java.util.List;
 
+import com.caimei.modules.oss.service.CmOssArchiveService;
+import com.caimei.modules.oss.utils.OSSUtils;
+import com.caimei.modules.user.entity.CmClubRemarks;
+import com.caimei.modules.user.entity.RemarksFileVo;
 import com.caimei.modules.user.entity.UserBeansHistory;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +18,9 @@ import com.thinkgem.jeesite.common.service.CrudService;
 import com.caimei.modules.user.entity.NewCmClub;
 import com.caimei.modules.user.dao.NewCmClubDao;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 用户模块重构--会所管理Service
  *
@@ -26,6 +34,9 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
     @Autowired
     private NewCmClubDao newCmClubDao;
 
+    @Autowired
+    private CmOssArchiveService cmOssArchiveService;
+
     public NewCmClub get(String id) {
         return super.get(id);
     }
@@ -75,4 +86,22 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
     public void insertBeansHistory(UserBeansHistory beansHistory) {
         newCmClubDao.insertBeansHistory(beansHistory);
     }
+
+    public Page<CmClubRemarks> findRemarksPage(Page<CmClubRemarks> page, CmClubRemarks cmClubRemarks){
+        cmClubRemarks.setPage(page);
+        List<CmClubRemarks> remarksList = newCmClubDao.findRemarksList(cmClubRemarks);
+        remarksList.forEach(remarks->{
+            List<String> imageList = newCmClubDao.getRemarksImageList(remarks.getRemarksId());
+            List<RemarksFileVo> fileList = newCmClubDao.getRemarksFileList(remarks.getRemarksId());
+            remarks.setImageList(imageList);
+            remarks.setFileList(fileList);
+        });
+        page.setList(remarksList);
+        return page;
+    }
+
+    public void downloadRemarks(String fileName, String ossName, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        OSSUtils.downFile(ossName, fileName);
+        cmOssArchiveService.download(request, response, fileName);
+    }
 }

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -33,6 +33,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.*;
 
 /**
@@ -694,4 +695,23 @@ public class AgencyController extends BaseController {
     public Map<String, String> checkMobile(String bindMobile, Integer userID) {
         return cmUserService.checkMobile(bindMobile, userID, "crm");
     }
+
+    /**
+     * 资料备注列表
+     */
+    @RequestMapping("remarks")
+    public String remarksList(CmClubRemarks cmClubRemarks,HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<CmClubRemarks> page = newCmClubService.findRemarksPage(new Page<CmClubRemarks>(request, response, 20), cmClubRemarks);
+        model.addAttribute("cmClubRemarks", cmClubRemarks);
+        model.addAttribute("page", page);
+        return "modules/userNew/cmAgencyRemarksList";
+    }
+
+    /**
+     * 资料备注列表
+     */
+    @RequestMapping("remarks/download")
+    public void downloadRemarks(String fileName, String ossName, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
+        newCmClubService.downloadRemarks(fileName, ossName, request, response);
+    }
 }

src/main/resources/mappings/modules/super/CmSvipHistoryMapper.xml

@@ -128,11 +128,11 @@
         LEFT JOIN club cb ON cs.userId = cb.userId
         LEFT JOIN cm_svip_user cu ON cs.userId = cu.userId
         <where>
-            <if test="clubName != null and clubName != ''">
-                and cb.name=#{clubName}
+            <if test="clubName!=null and clubName!=''">
+                and cb.name like concat('%',#{clubName},'%')
             </if>
-            <if test="linkMan != null and linkMan != ''">
-                and cb.linkMan1=#{linkMan} or linkMan2=#{linkMan}
+            <if test="linkMan!=null and linkMan!=''">
+                and cb.linkMan1 like concat('%',#{linkMan},'%') or linkMan2 like concat('%',#{linkMan},'%')
             </if>
             <if test="mobile != null and mobile != ''">
                 and cb.contractMobile1=#{mobile}

src/main/resources/mappings/modules/user/ClubTemporaryMapper.xml

@@ -25,11 +25,13 @@
 		a.mainProduct AS "mainProduct",
 		a.isAgreed AS "isAgreed",
 		a.addTime AS "addTime",
-		IFNULL(s.name,s.linkMan1) AS "spName"
+		IFNULL(s.name,s.linkMan1) AS "spName",
+        if(csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime,1,0) as svipUserFlag
 	</sql>
 	
 	<sql id="clubTemporaryJoins">
 		LEFT JOIN serviceprovider s ON s.userID = a.userId
+        LEFT JOIN cm_svip_user csu ON csu.userId = a.userId
 	</sql>
     
 	<select id="get" resultType="ClubTemporary">

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -95,11 +95,13 @@
 		u.bindMobile AS "bindMobile",
 		u.email AS "email",
 		u.userOrganizeID AS "userOrganizeID",
-		u.userIdentity AS "userIdentity"
+		u.userIdentity AS "userIdentity",
+        if(csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime,1,0) as svipUserFlag
 	</sql>
 
 	<sql id="newCmClubJoins">
 		LEFT JOIN user u ON u.userID = a.userID
+        LEFT JOIN cm_svip_user csu ON csu.userId = u.userID
 		LEFT JOIN serviceprovider sp ON sp.serviceProviderID = a.spID
 		LEFT JOIN town b ON b.townID=a.townID
 		LEFT JOIN city c ON c.cityID=b.cityID
@@ -177,9 +179,12 @@
 			<if test="endTime != null and endTime != ''">
 				AND (u.registerTime &lt; #{endTime} OR  u.registerTime = #{endTime})
 			</if>
-			<if test="userIdentity != null and userIdentity != ''">
+			<if test="userIdentity != null and userIdentity != '' and userIdentity != '8'.toString()">
 				AND u.userIdentity = #{userIdentity}
 			</if>
+			<if test="userIdentity != null and userIdentity != '' and userIdentity == '8'.toString()">
+				AND csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime
+			</if>
 			AND (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
 		</where>
 		<choose>
@@ -610,6 +615,25 @@
 	<select id="findSpId" resultType="java.lang.Integer">
 		select serviceProviderID from serviceprovider where serviceProviderID = #{spID} and status = 90
 	</select>
+    <select id="findRemarksList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
+		select id as remarksId, remarks,s.linkMan1 as spName, ccr.addTime
+		from cm_club_remarks ccr
+		left join serviceprovider s on ccr.serviceProviderId = s.serviceProviderID
+		where clubId = #{clubId}
+		order by addTime desc
+	</select>
+	<select id="getRemarksImageList" resultType="java.lang.String">
+		select imageUrl
+		from cm_club_remarks_file
+		where remarksId = #{remarksId}
+		  and fileType = 1
+	</select>
+	<select id="getRemarksFileList" resultType="com.caimei.modules.user.entity.RemarksFileVo">
+		select fileName, ossName
+		from cm_club_remarks_file
+		where remarksId = #{remarksId}
+		  and fileType = 2
+	</select>
 
 	<insert id="insertBeansHistory">
         INSERT INTO `user_beans_history` (

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

@@ -305,7 +305,7 @@
         <td style="display: none">
             <input name="ctx"  id="ctx0" value="${ctx}" readonly  style="width: 80px">
         </td>
-        <td>
+        <td style="display: none">
             <input type="text" name="svipReduction" id="svipReduction0" >
         </td>
         <td style="display: none">
@@ -344,6 +344,7 @@
     });
 
     function initData() {
+        debugger
         var data = window.parent.window.getCurPurchaseProduct('${purchaseProduct.productId}');
         console.log("kaifa ", data)
         var $checkItem = $("#check-item0");

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

@@ -86,7 +86,8 @@
 				</td>
 				<td>${club.spName}</td>
 				<td>
-						${empty club.businessLicense ? "普通机构" : "会员机构"}
+						${empty club.businessLicense ? "个人机构" : "资质机构"}
+					<font color="red">(普通会员)</font>
 				</td>
 				<td>
 					<fmt:formatDate value="${club.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>

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

@@ -11,16 +11,26 @@
             $("#inputForm").validate({
                 ignore: "",
                 submitHandler: function (form) {
+                    debugger
                     var bindMobile = $("#bindMobile").val();
                     var userID = $("#userID").val();
-                    $.post("${ctx}/new/user/agency/checkMobile?bindMobile="+bindMobile+"&userID="+userID, function (data) {
-                        if (data.code == -1) {
-                            alertx(data.msg);
-                        }else {
-                            loading('正在提交，请稍等...');
-                            form.submit();
-                        }
-                    })
+                    var submitFlag = true;
+                    var firstClubType = $('input[name=firstClubType]:checked').val();
+                    var secondClubType = $('input[name=secondClubType]:checked').val();
+                    if ((firstClubType == '1' && secondClubType > 4) || (firstClubType == '2' && secondClubType <= 4)) {
+                        alertx("请选择机构类型");
+                        submitFlag = false;
+                    }
+                    if (submitFlag) {
+                        $.post("${ctx}/new/user/agency/checkMobile?bindMobile="+bindMobile+"&userID="+userID, function (data) {
+                            if (data.code == -1) {
+                                alertx(data.msg);
+                            }else {
+                                loading('正在提交，请稍等...');
+                                form.submit();
+                            }
+                        })
+                    }
                 },
                 errorContainer: "#messageBox",
                 errorPlacement: function (error, element) {
@@ -230,11 +240,14 @@
             console.log(firstClubType)
             if (firstClubType == '1') {
                 $('.med-option,.qualification').show();
+            }else if (firstClubType == '2') {
+                $('.raw-option').show();
             }
             $('.medical-radio div input[name="firstClubType"]').on('click', function () {
                 var html = '';
                 var nameval = $(this).val();
                 if (nameval == '1') {
+                    $('.raw-option').hide();
                     $('.med-option,.qualification').show();
                     html += '<span class="new-tag up-club-tag" data-typeName="整形">整形</span>',
                         html += '<span class="new-tag up-club-tag" data-typeName="轻医美">轻医美</span>',
@@ -243,11 +256,13 @@
                     $('.Main-content').show();
                 } else if (nameval == '2') {
                     $('.med-option,.qualification,.epart').hide();
+                    $('.raw-option').show();
                     $('input[name="secondClubType"]').attr('checked', false);
                     html += '<span class="new-tag up-club-tag" data-typeName="美容">美容</span>',
                         html += '<span class="new-tag up-club-tag" data-typeName="美体">美体</span>',
                         html += '<span class="new-tag up-club-tag" data-typeName="美发">美发</span>',
                         html += '<span class="new-tag up-club-tag" data-typeName="皮肤管理">皮肤管理</span>',
+                        html += '<span class="new-tag up-club-tag" data-typeName="产后修复">产后修复</span>',
                         html += '<span class="new-tag up-club-tag" data-typeName="光电">光电</span>',
                         html += '<span class="new-tag up-club-tag" data-typeName="综合类">综合类</span>',
                         html += '<span class="new-tag up-club-tag" data-typeName="中医养生">中医养生</span>',
@@ -409,6 +424,11 @@
             margin: 10px 0 0 160px;
         }
 
+        .raw-option {
+            display: block;
+            margin: 10px 0 0 160px;
+        }
+
         .control-group .new-tag {
             display: inline-block;
             width: 78px;
@@ -599,10 +619,25 @@
                         <div class="med-beauty"><input name="secondClubType" value="3"
                                                        type="radio" ${cmClubinfo.secondClubType == "3" ? "checked" : ""}/>医院
                         </div>
+                        <div class="med-beauty"><input name="secondClubType" value="4"
+                                                       type="radio" ${cmClubinfo.secondClubType == "4" ? "checked" : ""}/>其他
+                        </div>
+                        <span class="err-tip"></span>
+                    </div>
+                    <div class="raw-option the-oradio" style="display: none">
+                        <div class="med-beauty"><input name="secondClubType" value="5"
+                                                       type="radio"  ${cmClubinfo.secondClubType == "5" ? "checked" : ""}/>美容院
+                        </div>
+                        <div class="med-beauty"><input name="secondClubType" value="6"
+                                                       type="radio"  ${cmClubinfo.secondClubType == "6" ? "checked" : ""}/>养生馆
+                        </div>
+                        <div class="med-beauty"><input name="secondClubType" value="7"
+                                                       type="radio" ${cmClubinfo.secondClubType == "7" ? "checked" : ""}/>其他
+                        </div>
                         <span class="err-tip"></span>
                     </div>
                     <div class="qualification control-group" style="display: none">
-                        <label class="control-label"><b>资质：</b></label>
+                        <label class="control-label"><b>医疗许可证：</b></label>
                         <div class="controls" style="margin-bottom: 10px">
                             <form:hidden id="medicalPracticeLicenseImg" path="medicalPracticeLicenseImg"
                                          htmlEscape="false" maxlength="255"

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

@@ -287,8 +287,9 @@
             <label>机构类别：</label>
             <form:select path="searchUserIdentity" class="input-medium">
                 <form:option value="" label="请选择"/>
-                <form:option value="4" label="普通机构"/>
-                <form:option value="2" label="会员机构"/>
+                <form:option value="4" label="个人机构"/>
+                <form:option value="2" label="资质机构"/>
+                <form:option value="8" label="超级会员"/>
             </form:select>
         </div>
         <div class="item">
@@ -396,10 +397,16 @@
             </td>
             <td>
                 <c:if test="${newCmClubList.userIdentity eq 4}">
-                    普通机构
+                    个人机构
                 </c:if>
                 <c:if test="${newCmClubList.userIdentity eq 2}">
-                    会员机构
+                    资质机构
+                </c:if>
+                <c:if test="${newCmClubList.svipUserFlag eq 1}">
+                    <font color="red">(超级会员)</font>
+                </c:if>
+                <c:if test="${newCmClubList.userIdentity eq 2 and newCmClubList.svipUserFlag eq 0}">
+                    <font color="red">(普通会员)</font>
                 </c:if>
             </td>
             <td>
@@ -443,6 +450,7 @@
                     <c:if test="${newCmClubList.status eq 92 || newCmClubList.status eq 93}">
                         <a href="${ctx}/user/clubTemporary/confirmRecord?confirmUserId=${newCmClubList.userID}">确认记录</a>
                     </c:if>
+                    <a href="${ctx}/new/user/agency/remarks?clubId=${newCmClubList.clubID}" >资料备注</a>
                 </td>
             </shiro:hasPermission>
         </tr>
@@ -517,8 +525,8 @@
     <div class="alert-content">
         <p>请选择类别</p>
         <div class="from-radio">
-            <input type="radio" value="1" name="clubType">会员机构
-            <input type="radio" value="2" name="clubType">普通机构
+            <input type="radio" value="1" name="clubType">资质机构
+            <input type="radio" value="2" name="clubType">个人机构
         </div>
     </div>
     <div class="alertModal-btn">

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

@@ -0,0 +1,78 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>机构资料备注</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			//$("#name").focus();cmOrderRemarksFormNew.jsp
+			$("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/new/user/agency/">机构列表</a></li>
+		<li class="active"><a href="${ctx}/new/user/agency/remarks?clubId=${cmClubRemarks.clubId}">资料备注</a></li>
+	</ul><br/>
+	<form:form id="inputForm" modelAttribute="cmOrderRemark" action="${ctx}" method="post" class="form-horizontal">
+	<sys:message content="${message}"/>
+	<c:if test="${not empty page.list}">
+	<div style="overflow-x: hidden;word-break:break-all">
+		<c:forEach items="${page.list}" var="clubRemarks" varStatus="remark">
+			<div class="td clear" style="dashed #0066CC;">
+				<div style="font-weight: bold;width: 100%;float: left;"><span style="float: left;">${clubRemarks.spName}</span>
+					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${clubRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span></div>
+				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">文字备注:</div>
+					<div style="width: 1000px;float: left;margin: 10px 0;">
+						${clubRemarks.remarks}
+					</div>
+				</div>
+				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
+					<c:if test="${not empty clubRemarks.imageList}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">图片:</div>
+						<div style="width: 1000px;float: left;">
+							<c:forEach items="${clubRemarks.imageList}" var="imageUrl" varStatus="remarkImage">
+								<a href="${imageUrl}" target="_blank">
+									<img class="enlarge-pic" style="height: 150px;width: 150px;margin-top: 10px" src="${imageUrl}">&nbsp;
+								</a>
+							</c:forEach>
+						</div>
+					</c:if>
+				</div>
+				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
+					<c:if test="${not empty clubRemarks.fileList}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">文件:</div>
+						<div style="width: 1000px;float: left;margin: 10px 0;">
+							<c:forEach items="${clubRemarks.fileList}" var="item" varStatus="remarkFile">
+								<p>${item.fileName}&nbsp;&nbsp;&nbsp;&nbsp;<a href="${ctx}/new/user/agency/remarks/download?fileName=${item.fileName}&ossName=${item.ossName}">下载</a></p>
+							</c:forEach>
+						</div>
+					</c:if>
+				</div>
+			</div>
+		</c:forEach>
+	</div>
+	</c:if>
+	<c:if test="${empty page.list}">
+		<font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无任何备注..</font>
+	</c:if>
+</form:form>
+</body>
+</html>

src/main/webapp/static/modules/bulkpurchase/orderForm.js

@@ -1895,6 +1895,7 @@ function num(obj) {
 
 // 添加供应应付商金额
 function shopFee(i) {
+    debugger
     var $shopFee = $("#shopFee1" + i).val();
     var shopFee = Number($shopFee);
     var $checkItem = eval('(' + $("#check-item" + i).val() + ')');
@@ -1944,6 +1945,7 @@ function otherFee(i) {
 }
 // 添加采美应付金额
 function cmFee(i) {
+    debugger
     var discountPrice = $("#discountPrice" + i).val(); //折后单价
     var shopFee1 = $("#shopFee1" + i).val(); //应付供应商
     var otherFee1 = $("#otherFee1" + i).val() //应付第三方