fixbug

src/main/java/com/caimei/modules/hehe/dao/CmHeheUserDao.java

@@ -75,4 +75,6 @@ public interface CmHeheUserDao extends CrudDao<CmHeheUser> {
      * @param id
      */
     void updateSortById(@Param("sort") String sort, @Param("id") String id);
+
+    void deleteUserActivity(@Param("userId") Integer userId, @Param("productId") String productId);
 }

src/main/java/com/caimei/modules/hehe/service/CmHeheUserService.java

@@ -127,4 +127,9 @@ public class CmHeheUserService extends CrudService<CmHeheUserDao, CmHeheUser> {
     public void saveSort(String sort, String id) {
         cmHeheUserDao.updateSortById(sort, id);
     }
+
+    @Transactional(readOnly = false)
+    public void deleteActivityProduct(Integer userId, String productId) {
+        cmHeheUserDao.deleteUserActivity(userId,productId);
+    }
 }

src/main/java/com/caimei/modules/hehe/web/CmHeheUserController.java

@@ -124,6 +124,16 @@ public class CmHeheUserController extends BaseController {
         return map;
     }
 
+    /**
+     * 删除分销者活动商品
+     */
+    @RequestMapping(value = "deleteActivityProduct")
+    public String deleteActivityProduct(Integer userId, String productId, RedirectAttributes redirectAttributes) {
+        cmHeheUserService.deleteActivityProduct(userId, productId);
+        addMessage(redirectAttributes, "删除商品成功");
+        return "redirect:" + Global.getAdminPath() + "/hehe/cmHeheUser/activityProductList?userId=" + userId;
+    }
+
     /**
      * 批量更新排序值
      */

src/main/resources/mappings/modules/hehe/CmHeheProductMapper.xml

@@ -60,7 +60,7 @@
 				AND p.name LIKE CONCAT('%',#{name},'%')
 			</if>
 			<if test="shopName != null and shopName != ''">
-				AND s.shopName LIKE CONCAT('%',#{shopName},'%')
+				AND s.name LIKE CONCAT('%',#{shopName},'%')
 			</if>
 			<if test="recommend != null and recommend != ''">
 				AND a.recommend = #{recommend}

src/main/resources/mappings/modules/hehe/CmHeheUserMapper.xml

@@ -15,7 +15,10 @@
 	
 	<sql id="cmHeheUserJoins">
 	</sql>
-    
+	<delete id="deleteUserActivity">
+		delete from cm_hehe_user_activity where userId = #{userId} and productId = #{productId}
+	</delete>
+
 	<select id="get" resultType="CmHeheUser">
 		SELECT 
 			<include refid="cmHeheUserColumns"/>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheActivityProductForm.jsp

@@ -14,6 +14,32 @@
             //$("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function (form) {
+                    debugger
+                    alertx(111)
+                    if ($('input[name="activityLadderList[0].buyNum"]:visible').length>0){
+                        var buyNum = $('input[name="activityLadderList[0].buyNum"]').val();
+                        var buyPrice = $('input[name="activityLadderList[0].buyPrice"]').val();
+                        if(buyNum<=0 || buyNum == '' || buyPrice<=0 || buyPrice == ''){
+                            alertx("请输入正确的阶梯价格");
+                            return false;
+                        }
+                    }
+                    if ($('input[name="activityLadderList[1].buyNum"]:visible').length>0){
+                        var buyNum1 = $('input[name="activityLadderList[1].buyNum"]').val();
+                        var buyPrice1 = $('input[name="activityLadderList[1].buyPrice"]').val();
+                        if(buyNum1<=0 || buyNum1 == '' || buyPrice1<=0 || buyPrice1 == ''){
+                            alertx("请输入正确的阶梯价格");
+                            return false;
+                        }
+                    }
+                    if ($('input[name="activityLadderList[2].buyNum"]:visible').length>0){
+                        var buyNum2 = $('input[name="activityLadderList[2].buyNum"]').val();
+                        var buyPrice2 = $('input[name="activityLadderList[2].buyPrice"]').val();
+                        if(buyNum2<=0 || buyNum2 == '' || buyPrice2<=0 || buyPrice2 == ''){
+                            alertx("请输入正确的阶梯价格");
+                            return false;
+                        }
+                    }
                     loading('正在提交，请稍等...');
                     form.submit();
                 },
@@ -138,6 +164,27 @@
     }
 
     function onclickSave() {
+        if ($('input[name="activityLadderList[0].buyNum"]:visible').length>0){
+            var buyNum = $('input[name="activityLadderList[0].buyNum"]').val();
+            var buyPrice = $('input[name="activityLadderList[0].buyPrice"]').val();
+            if(buyNum<=0 || buyNum == '' || buyPrice<=0 || buyPrice == ''){
+                return false;
+            }
+        }
+        if ($('input[name="activityLadderList[1].buyNum"]:visible').length>0){
+            var buyNum1 = $('input[name="activityLadderList[1].buyNum"]').val();
+            var buyPrice1 = $('input[name="activityLadderList[1].buyPrice"]').val();
+            if(buyNum1<=0 || buyNum1 == '' || buyPrice1<=0 || buyPrice1 == ''){
+                return false;
+            }
+        }
+        if ($('input[name="activityLadderList[2].buyNum"]:visible').length>0){
+            var buyNum2 = $('input[name="activityLadderList[2].buyNum"]').val();
+            var buyPrice2 = $('input[name="activityLadderList[2].buyPrice"]').val();
+            if(buyNum2<=0 || buyNum2 == '' || buyPrice2<=0 || buyPrice2 == ''){
+                return false;
+            }
+        }
         var params = "";
         var buyNum = $('input[name="activityLadderList[0].buyNum"]').val() * 1;
         var buyPrice = $('input[name="activityLadderList[0].buyPrice"]').val() * 1;

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheActivityProductList.jsp

@@ -169,16 +169,21 @@
                 if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
                     var params = $jboxFrame[0].contentWindow.onclickSave();
                     console.log(params);
-                    $.post("${ctx}/hehe/cmHeheActivityProduct/saveActivityLadder?params=" + params + "&id=" + id, function (data) {
-                        if (true == data.success) {
-                            $.jBox.tip(data.info, 'info');
-                            setTimeout(function () {
-                                window.location.href = "${ctx}/hehe/cmHeheActivityProduct/list?activityId=${activityProduct.activityId}"
-                            }, 1300);
-                        } else {
-                            $.jBox.tip(data.info, 'error');
-                        }
-                    }, "JSON");//这里返回的类型有：json,html,xml,text
+                    if (params != false) {
+                        $.post("${ctx}/hehe/cmHeheActivityProduct/saveActivityLadder?params=" + params + "&id=" + id, function (data) {
+                            if (true == data.success) {
+                                $.jBox.tip(data.info, 'info');
+                                setTimeout(function () {
+                                    window.location.href = "${ctx}/hehe/cmHeheActivityProduct/list?activityId=${activityProduct.activityId}"
+                                }, 1300);
+                            } else {
+                                $.jBox.tip(data.info, 'error');
+                            }
+                        }, "JSON");//这里返回的类型有：json,html,xml,text
+                    } else {
+                        showLadder(id);
+                        alertx("请输入正确的阶梯价格")
+                    }
                 }
                 return true;
             }

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheProductForm.jsp

@@ -67,7 +67,7 @@
 			<div class="control-group">
 				<label class="control-label"><font color="red">*</font>售价：</label>
 				<div class="controls">
-					<input type="number" style="width:100px;" id="price" name="price" value="${cmHeheProduct.price}" required>
+					<input type="number" type="number" style="width:100px;" id="price" name="price" value="${cmHeheProduct.price}" required onblur="checkPrice(this)">
 				</div>
 			</div>
 			<div class="control-group">
@@ -286,6 +286,16 @@
 	function onlynum(obj) {
 		obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
 	}
+
+	/**
+	 * @param obj
+	 * jquery检验售价
+	 */
+	function checkPrice(obj) {
+		if (obj.value == '0') {
+			obj.value = '';
+		}
+	}
 </script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheUserForm.jsp

@@ -9,8 +9,14 @@
 			//$("#name").focus();
 			$("#inputForm").validate({
 				submitHandler: function(form){
-					loading('正在提交，请稍等...');
-					form.submit();
+					debugger
+					let val = $("#mobile").val();
+					if (!val.startsWith("1") || val.length != 11) {
+						alertx("请输入正确的手机号");
+					} else {
+						loading('正在提交，请稍等...');
+						form.submit();
+					}
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
@@ -42,7 +48,7 @@
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>手机号：</label>
 			<div class="controls">
-				<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-xlarge required"/>
+				<form:input path="mobile" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
 			</div>
 		</div>
 		<c:if test="${not empty cmHeheUser.openId}">

src/main/webapp/WEB-INF/views/modules/hehe/userActivityProductList.jsp

@@ -97,7 +97,7 @@
                        onkeyup="onlynum(this)" onchange="changeSort(${cmHeheActivityProduct.id},this)">
             </td>
             <td>
-                <a href="${ctx}/hehe/cmHeheActivityProduct/delete?id=${cmHeheActivityProduct.id}"
+                <a href="${ctx}/hehe/cmHeheUser/deleteActivityProduct?userId=${cmHeheActivityProduct.userId}&productId=${cmHeheActivityProduct.productId}"
                    onclick="return confirmx('确认要删除该商品吗？', this.href)">删除</a>
             </td>
         </tr>