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

src/main/java/com/caimei/modules/supers/service/CmSvipPackageService.java

@@ -53,9 +53,24 @@ public class CmSvipPackageService extends CrudService<CmSvipPackageDao, CmSvipPa
             }
             vip.setProportion(cmSvipPackage.getProportion());
         }
+        String price1 = strs(vip.getPrice1());
+        String price2 = strs(vip.getPrice2());
+        String price3 = strs(vip.getPrice3());
+        vip.setPrice1(price1);
+        vip.setPrice2(price2);
+        vip.setPrice3(price3);
         return vip;
     }
 
+    private static String strs(String str) {
+        if (str.indexOf(".") > 0) {
+            str = str.replaceAll("0+?$", "");//删掉尾数为0的字符
+            str = str.replaceAll("[.]$", "");//结尾如果是小数点，则去掉
+        }
+        return str;
+    }
+
+
     @Transactional(readOnly = false)
     public void save(CmSvipPackage cmSvipPackage) {
         super.save(cmSvipPackage);

src/main/java/com/caimei/modules/utils/DateUtil.java

@@ -51,6 +51,7 @@ public class DateUtil {
         String format = new SimpleDateFormat("yyyy-MM").format(date);
         return format;
     }
+
 //    public static void main(String[] args) throws ParseException {
 //        String month = "2020-02";
 //        System.out.println(getMinDateMonth(month));

src/main/webapp/WEB-INF/views/modules/super/cmSvipPackageForm.jsp

@@ -11,7 +11,7 @@
                 submitHandler: function (form) {
                     var places = $(".input-xlarge").val();
                     if (!(/(^[1-9]\d*$)/.test(places))) {
-                        alert("金额应为正整数,如 100");
+                        alert("售价或采美豆比例应为正整数且不能为0,如100");
                         return false;
                     }
                     loading('正在提交，请稍等...');
@@ -41,16 +41,17 @@
            class="form-horizontal">
     <form:hidden path="id"/>
     <sys:message content="${message}"/>
-<%--    <div class="control-group">--%>
-<%--        <label class="control-label">套餐名称：</label>--%>
-<%--        <div class="controls">--%>
-<%--            <form:input path="name" htmlEscape="false" maxlength="50" class="input-lab"/>--%>
-<%--        </div>--%>
-<%--    </div>--%>
+    <%--    <div class="control-group">--%>
+    <%--        <label class="control-label">套餐名称：</label>--%>
+    <%--        <div class="controls">--%>
+    <%--            <form:input path="name" htmlEscape="false" maxlength="50" class="input-lab"/>--%>
+    <%--        </div>--%>
+    <%--    </div>--%>
     <div class="control-group">
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>套餐1：</label>
         <div class="controls">
-            12个月超级会员，售价:<form:input path="price1" htmlEscape="false" class="input-xlarge" style="width: 60px"/>
+            12个月超级会员，售价:
+            <form:input path="price1" htmlEscape="false" class="input-xlarge" style="width: 60px"/>
         </div>
     </div>
     <div class="control-group">