bugfix-呵呵拼团/分享减免

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

@@ -42,7 +42,9 @@ public class CmHeheCollageProductController extends BaseController {
 		CmHeheCollageProduct entity = null;
 		if (StringUtils.isNotBlank(id)){
 			entity = cmHeheCollageProductService.get(id);
-			entity.setProductImage(AppUtils.getImageURL("product", entity.getProductImage(), 0, "https://www.caimei365.com/"));
+            if (null != entity) {
+                entity.setProductImage(AppUtils.getImageURL("product", entity.getProductImage(), 0, "https://www.caimei365.com/"));
+            }
 		}
 		if (entity == null){
 			entity = new CmHeheCollageProduct();

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

@@ -80,7 +80,7 @@
 		where collageId = #{collageId} and co.receiptStatus = 3
 	</select>
 	<select id="findMemberList" resultType="com.caimei.modules.hehe.entity.CmHeheCollageMember">
-		select chu.nickName,cm.launchFlag,chu.mobile,chu.userIdentity,co.orderTime,co.orderNo
+		select chu.nickName,cm.launchFlag,chu.mobile,chu.userIdentity,co.orderTime,co.orderNo,co.orderID as orderId
 		from cm_hehe_collage_member cm
 		left join user u on cm.userId = u.userID
 		left join cm_hehe_user chu on u.userID = chu.userId

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

@@ -25,7 +25,7 @@
 		<li><a href="${ctx}/hehe/cmHeheReduction">分享减免活动列表</a></li>
 		<li class="active"><a href="${ctx}/hehe/cmHeheReduction/userList?reductionId=${cmHeheReductionUser.reductionId}">领取用户列表</a></li>
 	</ul>
-	<form:form id="searchForm" modelAttribute="cmHeheReductionUser" action="${ctx}/hehe/cmHeheCollage/memberList" method="post" class="breadcrumb form-search">
+	<form:form id="searchForm" modelAttribute="cmHeheReductionUser" action="${ctx}/hehe/cmHeheReduction/userList" method="post" class="breadcrumb form-search">
 		<form:hidden path="reductionId"/>
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>