bugfix

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

@@ -192,7 +192,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     }
                 }
             }
-            // 获取
 
             //采购中选中保存的订单商品
             List<NewOrderProduct> orderProducts = newOrder.getOrderProduct();
@@ -992,6 +991,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         orderProduct.setLadderPriceFlag(0);
         orderProduct.setIncludedTax(product.getIncludedTax());
         orderProduct.setInvoiceType(product.getInvoiceType());
+        orderProduct.setSvipPriceFlag(0);
         newOrderProductDao.insert(orderProduct);
     }
 

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

@@ -65,6 +65,7 @@ public class CmClubinfo extends DataEntity<CmClubinfo> {
     private String mainpro;    //主打项目
     private String medicalPracticeLicenseImg;  //医美分类必须上传医疗执业许可证
     private String contractEmail1;  //邮箱
+    private Integer linkManIdentity;    //联系人身份：1老板，2采购，3运营
 
     public String getContractEmail1() {
         return contractEmail1;
@@ -434,4 +435,12 @@ public class CmClubinfo extends DataEntity<CmClubinfo> {
     public void setBindMobile(String bindMobile) {
         this.bindMobile = bindMobile;
     }
+
+    public Integer getLinkManIdentity() {
+        return linkManIdentity;
+    }
+
+    public void setLinkManIdentity(Integer linkManIdentity) {
+        this.linkManIdentity = linkManIdentity;
+    }
 }

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

@@ -56,6 +56,7 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private Integer mainClubID;        // 集团会所ID
     private Double turnover;        // 营业额
     private String linkMan;        // 联系人
+    private Integer linkManIdentity;    //联系人身份：1老板，2采购，3运营
     private String contractPhone;        // 联系电话
     private String contractMobile;        // 联系手机
     private String fax;        // 传真
@@ -1033,4 +1034,12 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     public void setSvipUserFlag(Integer svipUserFlag) {
         this.svipUserFlag = svipUserFlag;
     }
+
+    public Integer getLinkManIdentity() {
+        return linkManIdentity;
+    }
+
+    public void setLinkManIdentity(Integer linkManIdentity) {
+        this.linkManIdentity = linkManIdentity;
+    }
 }

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

@@ -294,6 +294,7 @@ public class AgencyController extends BaseController {
         cmClubinfo.setMainpro(newCmClub.getMainpro());
         cmClubinfo.setMedicalPracticeLicenseImg(newCmClub.getMedicalPracticeLicenseImg());
         cmClubinfo.setContractEmail1(newCmClub.getContractEmail1());
+        cmClubinfo.setLinkManIdentity(newCmClub.getLinkManIdentity());
 
         model.addAttribute("cmClubinfo", cmClubinfo);
         model.addAttribute("newCmClub", newCmClub);
@@ -388,6 +389,7 @@ public class AgencyController extends BaseController {
         newCmClub.setContractEmail1(cmClubinfo.getContractEmail1());
         newCmClub.setContractMobile(bindMobile);
         newCmClub.setLinkMan(userName);
+        newCmClub.setLinkManIdentity(cmClubinfo.getLinkManIdentity());
         newCmClub.setLinkMan1(userName);
         newCmClub.setName(name);
         newCmClub.setSname(cmClubinfo.getSname());
@@ -533,7 +535,8 @@ public class AgencyController extends BaseController {
                 companyUser.setUserPermission(userPermission);
                 //审核通过升级为会员机构
                 companyUser.setUserIdentity(2);
-                smsMessage = "恭喜您成功升级为会员机构！立马登录采美365网享受享受更多更好的服务吧~";
+                smsMessage = "恭喜您成功升级为资质机构用户！快戳采美网站链接www.caimei365.com或微信搜索“采美采购商城”小程序登录采美平台享受更多更好的服务吧。" +
+                        "关注公众号“采美365网”可获取更多优惠和精彩资讯。";
                 int userBeans = companyUser.getUserBeans() == null ? 0 : companyUser.getUserBeans();
                 companyUser.setUserBeans(userBeans + 500);
             } else {
@@ -542,7 +545,8 @@ public class AgencyController extends BaseController {
                 companyUser.setUserPermission(userPermission);
                 status = "92";
                 auditStatus = "2";
-                smsMessage = "您的机构升级会员机构失败！请登录采美365修改升级信息重新提交审核";
+                smsMessage = "您的机构升级资质机构失败！快戳采美网站链接www.caimei365.com或微信搜索“采美采购商城”小程序登录采美平台修改升级信息重新提交审核。" +
+                        "关注公众号“采美365网”可获取更多优惠和精彩资讯。";
             }
             //机构表修改
             newCmClub.setStatus(Integer.parseInt(status));

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

@@ -31,6 +31,7 @@
 		a.mainClubID AS "mainClubID",
 		a.turnover AS "turnover",
 		a.linkMan AS "linkMan",
+		a.linkManIdentity AS "linkManIdentity",
 		a.contractPhone AS "contractPhone",
 		a.contractMobile AS "contractMobile",
 		a.fax AS "fax",
@@ -244,6 +245,7 @@
 			mainClubID,
 			turnover,
 			linkMan,
+			linkManIdentity,
 			contractPhone,
 			contractMobile,
 			fax,
@@ -319,6 +321,7 @@
 			#{mainClubID},
 			#{turnover},
 			#{linkMan},
+			#{linkManIdentity},
 			#{contractPhone},
 			#{contractMobile},
 			#{fax},
@@ -447,6 +450,9 @@
 		<if test="linkMan != null and linkMan != ''">
 			linkMan = #{linkMan},
 			</if>
+		<if test="linkManIdentity != null and linkManIdentity != ''">
+			linkManIdentity = #{linkManIdentity},
+			</if>
 		<if test="contractPhone != null and contractPhone != ''">
 			contractPhone = #{contractPhone},
 			</if>

src/main/webapp/WEB-INF/views/modules/svip/cmSvipProductForm.jsp

@@ -66,7 +66,7 @@
 			<label class="control-label">是否含税：</label>
 			<div class="controls">
 				<label class="showLabel">${cmSvipProduct.includedTax == '1'?'含税':(cmSvipProduct.includedTax == '0'?'不含税':'未知')}
-                        ${cmSvipProduct.includedTax == '2'?'':(cmSvipProduct.invoiceType == '1'?'-开增值税专用发票':'-开增值税普通发票')}</label>
+                        ${cmSvipProduct.includedTax == '2'?'':(cmSvipProduct.invoiceType == '1'?'-开增值税专用发票':(cmSvipProduct.invoiceType == '2'?'-开增值税普通发票':'-不能开票'))}</label>
 			</div>
 		</div>
 		<div class="control-group" style="display: ${cmSvipProduct.includedTax == '2'?'none':''}">
@@ -160,11 +160,10 @@
 	 * 更改折扣/折扣价
 	 */
 	function changeDiscount(obj,priceType) {
-		debugger
 		var val = obj.value;
 		var number = Number(val).toFixed(2);
 		if (priceType == 1) {
-			if (val > 100 || val <0) {
+			if (val > 100 || val <= 0) {
 				$.jBox.tip("请输入0-100之间的数字", 'info');
 				obj.value = '';
 			}else {

src/main/webapp/WEB-INF/views/modules/svip/cmSvipProductList.jsp

@@ -44,7 +44,7 @@
 		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 		<div class="ul-form">
 			 <label>商品ID：</label>
-				<form:input path="productId" htmlEscape="false" onkeyup="onlynum(this)" class="input-medium"/>
+				<form:input path="productId" htmlEscape="false" onkeyup="onlynum(this)" maxlength="8" class="input-medium"/>
 			 <label>商品名称：</label>
 				<form:input path="productName" htmlEscape="false" class="input-medium"/>
 			 <label>供应商：</label>

src/main/webapp/WEB-INF/views/modules/svip/svipAddProduct.jsp

@@ -145,7 +145,7 @@
             var val = $("#discount" + productId).val();
             if (val == '') {
                 $("#discountPrice"+productId).removeAttr('readonly');
-            } else if (val > 100 || val <0) {
+            } else if (val > 100 || val <=0) {
                 $.jBox.tip("请输入0-100之间的数字", 'info');
                 $("#discount" + productId).val('');
                 $("#discountPrice"+productId).removeAttr('readonly');

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

@@ -522,8 +522,14 @@
                                         class="input-medium required"  value="${newCmClub.userName}"/>
             </td>
             <th width="12%"><font color="red">*</font> 手机号：</th>
-            <td colspan="3"><form:input path="bindMobile" htmlEscape="false" maxlength="20"
+            <td width="13%"><form:input path="bindMobile" htmlEscape="false" maxlength="20"
                                         class="input-medium required"  value="${newCmClub.bindMobile}" onchange="checkMobile()"/></td>
+            <th width="12%"><font color="red">*</font> 联系人身份：</th>
+            <td width="13%">
+                <form:radiobutton path="linkManIdentity" class="required" value="1" label="老板"/>
+                <form:radiobutton path="linkManIdentity" class="required" value="2" label="采购"/>
+                <form:radiobutton path="linkManIdentity" class="required" value="3" label="运营"/>
+            </td>
         </tr>
     </table>
 </div>

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

@@ -23,6 +23,14 @@
 				}
 			});
 		});
+
+
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+			return false;
+		}
 	</script>
 </head>
 <body>
@@ -30,7 +38,12 @@
 		<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">
+<form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/remarks" method="post" class="breadcrumb form-search">
+	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+	<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+	<form:hidden path="clubId"/>
+</form:form>
+<form:form id="inputForm" modelAttribute="cmClubRemarks" 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">
@@ -40,11 +53,11 @@
 					<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;">
+					<div style="width: 800px;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;">
+				<div class="td-text" style="width: 100%;float: left;">
 					<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;">
@@ -69,6 +82,7 @@
 			</div>
 		</c:forEach>
 	</div>
+	<div class="pagination">${page}</div>
 	</c:if>
 	<c:if test="${empty page.list}">
 		<font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无任何备注..</font>