Merge remote-tracking branch 'remotes/origin/developerD' into developer

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

@@ -615,9 +615,6 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                     beansHistory.setPushStatus(0);
                     newCmClubDao.insertBeansHistory(beansHistory);
                     userBeans = userBeans - num;
-                    if (userBeans < 0) {
-                        userBeans = 0;
-                    }
                     cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
                 }
             }

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -530,7 +530,7 @@ public class AgencyController extends BaseController {
                 companyUser.setUserIdentity(2);
                 smsMessage = "恭喜您成功升级为会员机构！立马登录采美365网享受享受更多更好的服务吧~";
                 int userBeans = companyUser.getUserBeans() == null ? 0 : companyUser.getUserBeans();
-                companyUser.setUserBeans(userBeans + 20);
+                companyUser.setUserBeans(userBeans + 500);
             } else {
                 //审核未通过,普通机构权限
                 userPermission = 5;
@@ -561,12 +561,12 @@ public class AgencyController extends BaseController {
             String messageContent = "";
             if (auditStatus.equals("1")) {
                 messageContent = "恭喜您，" + title + "【已通过】，恭喜您成功加入采美，祝您开启愉快的采购之旅。";
-                //升级为机构成功,送20采美豆
+                //升级为机构成功,送500采美豆
                 UserBeansHistory beansHistory = new UserBeansHistory();
                 beansHistory.setUserId(companyUser.getUserID());
                 beansHistory.setBeansType(2);
                 beansHistory.setType(1);
-                beansHistory.setNum(20);
+                beansHistory.setNum(500);
                 beansHistory.setPushStatus(0);
                 beansHistory.setAddTime(new Date());
                 newCmClubService.insertBeansHistory(beansHistory);

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -288,6 +288,7 @@
                 ${sqlMap.dsf}
             </if>
             AND a.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
+            AND a.productID NOT IN (6060, 6061, 6062, 6063, 6064,6065, 6066, 6067, 6068, 6069)
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/webapp/WEB-INF/views/modules/user/cmUserbeanshistoryList.jsp

@@ -50,6 +50,7 @@
 				<form:option value="9" label="抵用退回"/>
 				<form:option value="10" label="抵用运费"/>
 				<form:option value="11" label="退款回收"/>
+				<form:option value="12" label="登录奖励"/>
 			</form:select>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<div class="clearfix"></div>
@@ -108,6 +109,9 @@
 					<c:if test="${userBeansHistory.beansType eq 11}">
 						<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord?id=${userBeansHistory.returnedId}&orderID=${userBeansHistory.orderId}">退款回收</a>
 					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 12}">
+						登录奖励
+					</c:if>
 				</td>
 			</tr>
 		</c:forEach>