Merge remote-tracking branch 'origin/developer' into developerH

src/main/java/com/caimei/modules/info/dao/InfoDao.java

@@ -35,4 +35,6 @@ public interface InfoDao extends CrudDao<Info> {
 	void auditInfo(@Param("id") String id, @Param("auditStatus") Integer auditStatus, @Param("failReason") String failReason, @Param("pubdate") Date pubdate);
 
     void offlineInfo(Integer id);
+
+    void deleteInfo(String id);
 }

src/main/java/com/caimei/modules/info/service/InfoService.java

@@ -185,9 +185,10 @@ public class InfoService extends CrudService<InfoDao, Info> {
 
 	@Transactional(readOnly = false)
 	public void delete(Info info) {
-		super.delete(info);
-		infoDao.deleteInfoPraise(info.getId());//删除点赞
-		infoDao.deleteInfoPageByInfoId(info.getId());//删除信息分页
+//		super.delete(info);
+		infoDao.deleteInfo(info.getId());
+		//infoDao.deleteInfoPraise(info.getId());//删除点赞
+		//infoDao.deleteInfoPageByInfoId(info.getId());//删除信息分页
 	}
 
 	@Transactional(readOnly = false)

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -770,14 +770,15 @@ public class NewCmShopController extends BaseController {
 
         CmOperationalLogs sysLog = new CmOperationalLogs();
 
-        if (newCmShops.getMaintenanceFee() == "0") {
-            if (!newCmShop.getMaintenanceFee().equals("0")) {
-                list.add("新增了线上分账商户号");
-            }
-        } else if (!newCmShop.getMaintenanceFee().equals(newCmShops.getMaintenanceFee())) {
-            list.add("修改了线上分账商户号");
-        }
-
+//        if (newCmShops.getMaintenanceFee() == "0") {
+//            if (!newCmShop.getMaintenanceFee().equals("0")) {
+//                list.add("新增了线上分账商户号");
+//            }
+//        }  else {
+//            if (!newCmShop.getMaintenanceFee().equals(newCmShops.getMaintenanceFee())) {
+//                list.add("修改了线上分账商户号");
+//            }
+//        }
         if (newCmShops.getName() == null) {
             if (!newCmShop.getName().equals("")) {
                 list.add("新增了公司名称");

src/main/resources/mappings/modules/info/InfoMapper.xml

@@ -65,7 +65,7 @@
 		FROM info a
 		<include refid="infoJoins"/>
 		<where>
-
+			delFlag = 0
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
@@ -252,6 +252,9 @@
 		DELETE FROM info_page
 		WHERE infoId = #{param1}
 	</delete>
+	<update id="deleteInfo">
+		update info set enabledStatus = 0, delFlag = 1 where id = #{id};
+	</update>
 
 	<update id="updateEnabledStatusByIds">
 		UPDATE info a SET a.enabledStatus = #{param1}

src/main/webapp/WEB-INF/views/modules/coupon/MoneyCouponForm.jsp

@@ -13,16 +13,6 @@
                         var productInfo = JSON.stringify(imageList);
                         $('#productInfo').val(productInfo);
                     }
-                    var couponType = $("input[name='couponType']:checked").val();
-                    var productType = $("input[name='productType']:checked").val();
-                    if (couponType == 0 && productType == 2) {
-                        var pcBanner = $('#pcBanner').val();
-                        var appletsBanner = $('#appletsBanner').val();
-                        if (pcBanner == '' || appletsBanner == '') {
-                            alertx("请上传Banner图");
-                            return false;
-                        }
-                    }
                     var couponAmount = $("#couponAmount").val()*1;
                     var touchPrice = $("#touchPrice").val()*1;
                     if (couponAmount >= touchPrice) {
@@ -293,7 +283,7 @@
     </div>
     <div class="productData" hidden="hidden">
         <div class="control-group">
-            <label class="control-label"><font color="red">*</font>网站活动页banner：</label>
+            <label class="control-label">网站活动页banner：</label>
             <div class="controls upload-content-image iconBox">
                 <div class="conList">
                     <form:hidden id="pcBanner" path="pcBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>
@@ -303,7 +293,7 @@
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label"><font color="red">*</font>小程序活动页banner：</label>
+            <label class="control-label">小程序活动页banner：</label>
             <div class="controls upload-content-image iconBox">
                 <div class="conList">
                     <form:hidden id="appletsBanner" path="appletsBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>

src/main/webapp/WEB-INF/views/modules/coupon/cmCouponForm.jsp

@@ -15,14 +15,6 @@
 						$('#productInfo').val(productInfo);
 					}
 					var  productType = $("input[name='productType']:checked").val();
-					if (productType == 2){
-						var pcBanner = $('#pcBanner').val();
-						var appletsBanner = $('#appletsBanner').val();
-						if (pcBanner == '' || appletsBanner == '') {
-							alertx("请上传Banner图");
-							return false;
-						}
-					}
 					var couponAmount = $("#couponAmount").val()*1;
 					var touchPrice = $("#touchPrice").val()*1;
 					if (couponAmount >= touchPrice) {
@@ -203,7 +195,7 @@
 		</div>
 		<div class="productData" hidden="hidden">
 			<div class="control-group">
-				<label class="control-label"><font color="red">*</font>网站活动页banner：</label>
+				<label class="control-label">网站活动页banner：</label>
 				<div class="controls upload-content-image iconBox">
 					<div class="conList">
 						<form:hidden id="pcBanner" path="pcBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>
@@ -213,7 +205,7 @@
 				</div>
 			</div>
 			<div class="control-group">
-				<label class="control-label"><font color="red">*</font>小程序活动页banner：</label>
+				<label class="control-label">小程序活动页banner：</label>
 				<div class="controls upload-content-image iconBox">
 					<div class="conList">
 						<form:hidden id="appletsBanner" path="appletsBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>

src/main/webapp/WEB-INF/views/modules/coupon/redemptionCodeCouponForm.jsp

@@ -13,16 +13,6 @@
                         var productInfo = JSON.stringify(imageList);
                         $('#productInfo').val(productInfo);
                     }
-                    var couponType = $("input[name='couponType']:checked").val();
-                    var productType = $("input[name='productType']:checked").val();
-                    if (couponType == 0 && productType == 2) {
-                        var pcBanner = $('#pcBanner').val();
-                        var appletsBanner = $('#appletsBanner').val();
-                        if (pcBanner == '' || appletsBanner == '') {
-                            alertx("请上传Banner图");
-                            return false;
-                        }
-                    }
                     var couponAmount = $("#couponAmount").val()*1;
                     var touchPrice = $("#touchPrice").val()*1;
                     if (couponAmount >= touchPrice) {
@@ -208,7 +198,7 @@
         </div>
         <div class="productData" hidden="hidden">
             <div class="control-group">
-                <label class="control-label"><font color="red">*</font>网站活动页banner：</label>
+                <label class="control-label">网站活动页banner：</label>
                 <div class="controls upload-content-image iconBox">
                     <div class="conList">
                         <form:hidden id="pcBanner" path="pcBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>
@@ -218,7 +208,7 @@
                 </div>
             </div>
             <div class="control-group">
-                <label class="control-label"><font color="red">*</font>小程序活动页banner：</label>
+                <label class="control-label">小程序活动页banner：</label>
                 <div class="controls upload-content-image iconBox">
                     <div class="conList">
                         <form:hidden id="appletsBanner" path="appletsBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>