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

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

@@ -290,7 +290,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             //凑单金额
                             AtomicReference<BigDecimal> poolAmount = new AtomicReference<>(BigDecimal.ZERO);
                             orderProducts.forEach(o -> {
-                                if (o.getDiscount() >= 100d && 0 == o.getSvipPriceFlag()) {
+                                if (o.getDiscount() >= 100d && (null == o.getSvipPriceFlag() || 0 == o.getSvipPriceFlag())) {
                                     CmPromotion cmPromotion = cmPromotionDao.findProductPromotion(o.getShopID().toString(), o.getProductID().longValue());
                                     if (cmPromotion != null && cmPromotion.getId().equals(promotion.getId())) {
                                         poolAmount.set(MathUtil.add(poolAmount, o.getTotalFee()));
@@ -456,6 +456,9 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                         if (orderProduct.getLadderPriceFlag() == null) {
                             orderProduct.setLadderPriceFlag(0);
                         }
+                        if (orderProduct.getSvipPriceFlag() == null) {
+                            orderProduct.setSvipPriceFlag(0);
+                        }
                         newOrderProductDao.insert(orderProduct);
                         //插入阶梯价格列表
                         insertLadderPrice(orderProduct);

src/main/java/com/caimei/modules/order/utils/OrderUtil.java

@@ -99,7 +99,7 @@ public class OrderUtil {
                 shopOrder.setNeedPayAmount(o.getShouldPayFee());
                 shopOrder.setOutStoreNum(0);
                 // 计算超级会员优惠
-                if (1 == o.getSvipPriceFlag()) {
+                if (null != o.getSvipPriceFlag() && 1 == o.getSvipPriceFlag()) {
                     BigDecimal productTotalReduction = MathUtil.mul(o.getSvipReduction(), o.getNum(), 2);
                     shopOrder.setSvipShopReduction(MathUtil.add(shopOrder.getSvipShopReduction(), productTotalReduction).doubleValue());
                 } else {

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

@@ -123,7 +123,7 @@
 
 
     <select id="superFind" resultType="com.caimei.modules.supervip.entity.CmSvipHistory">
-        SELECT cb.name as clubName, cb.linkMan1 as linkMan, cb.contractMobile1 as mobile,
+        SELECT u.name as clubName, u.username as linkMan, u.bindMobile as mobile,
         cs.userId,cs.beginTime,cs.endTime,cs.packageId
         FROM cm_svip_history cs
         LEFT JOIN club cb ON cs.userId = cb.userId

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

@@ -9,9 +9,24 @@
             //$("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function (form) {
-                    var places = $(".input-xlarge").val();
-                    if (!(/(^[1-9]\d*$)/.test(places))) {
-                        alert("售价或采美豆比例应为正整数且不能为0,如100");
+                    var places1 = $(".input-xlarge1").val();
+                    if (!(/(^[1-9]\d*$)/.test(places1))) {
+                        alert("套裁1售价应为正整数且不能为0,如100");
+                        return false;
+                    }
+                    var places2 = $(".input-xlarge2").val();
+                    if (!(/(^[1-9]\d*$)/.test(places2))) {
+                        alert("套裁2售价应为正整数且不能为0,如100");
+                        return false;
+                    }
+                    var places3 = $(".input-xlarge3").val();
+                    if (!(/(^[1-9]\d*$)/.test(places3))) {
+                        alert("套裁3售价应为正整数且不能为0,如100");
+                        return false;
+                    }
+                    var places4 = $(".input-xlarge4").val();
+                    if (!(/(^[1-9]\d*$)/.test(places4))) {
+                        alert("美豆比例应为正整数且不能为0,如100");
                         return false;
                     }
                     loading('正在提交，请稍等...');
@@ -29,7 +44,28 @@
             });
         });
 
-
+        function checkNum(){
+            var places1 = $(".input-xlarge1").val();
+            if (!(/(^[1-9]\d*$)/.test(places1))) {
+                alert("套裁1售价应为正整数且不能为0,如100");
+                return false;
+            }
+            var places2 = $(".input-xlarge2").val();
+            if (!(/(^[1-9]\d*$)/.test(places2))) {
+                alert("套裁2售价应为正整数且不能为0,如100");
+                return false;
+            }
+            var places3 = $(".input-xlarge3").val();
+            if (!(/(^[1-9]\d*$)/.test(places3))) {
+                alert("套裁3售价应为正整数且不能为0,如100");
+                return false;
+            }
+            var places4 = $(".input-xlarge4").val();
+            if (!(/(^[1-9]\d*$)/.test(places4))) {
+                alert("美豆比例应为正整数且不能为0,如100");
+                return false;
+            }
+        }
     </script>
 </head>
 <body>
@@ -51,26 +87,26 @@
         <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"/>
+            <form:input path="price1" htmlEscape="false" class="input-xlarge1" style="width: 60px" onblur="checkNum()"/>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>套餐2：</label>
         <div class="controls">
-            3个月超级会员，售价:<form:input path="price2" htmlEscape="false" class="input-xlarge" style="width: 60px"/>
+            3个月超级会员，售价:<form:input path="price2" htmlEscape="false" class="input-xlarge2" style="width: 60px" onblur="checkNum()"/>
         </div>
     </div>
 
     <div class="control-group">
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>套餐3：</label>
         <div class="controls">
-            1个月超级会员，售价:<form:input path="price3" htmlEscape="false" class="input-xlarge" style="width: 60px"/>
+            1个月超级会员，售价:<form:input path="price3" htmlEscape="false" class="input-xlarge3" style="width: 60px" onblur="checkNum()"/>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>采美豆兑换套餐：</label>
         <div class="controls">
-            采美豆兑换超会员套餐比例为<form:input path="proportion" htmlEscape="false" class="input-xlarge" style="width: 30px"/>:1
+            采美豆兑换超会员套餐比例为<form:input path="proportion" htmlEscape="false" class="input-xlarge4" style="width: 30px" onblur="checkNum()"/>:1
         </div>
     </div>
     <div class="form-actions">