奖品

src/main/java/com/ssj/dao/sys/award/dao/impl/AwardQueryDaoImpl.java

@@ -32,7 +32,7 @@ public class AwardQueryDaoImpl implements AwardQueryDao {
         List<Object> queryParams = new ArrayList<Object>();
         selSQL.append(" SELECT t.*, ");
         selSQL.append(" (SELECT COUNT(1) from tb_award_sncode s WHERE s.award_material_id=t.id and s.`status` in (0)) as not_use_number, ");
-        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode s WHERE s.award_material_id=t.id and s.`status` in (1,2,3,4)) as use_number ");
+        selSQL.append(" (SELECT COUNT(1) from tb_award_sncode s WHERE s.award_material_id=t.id and s.`status` in (1,2,3,4)) as new_use_number ");
         selSQL.append(" from tb_award_material t WHERE t.status=1  ");
         if (searchParams.get("name") != null && !searchParams.get("name").equals("")) {
         	selSQL.append(" and  t.`name` LIKE  CONCAT(CONCAT('%',?,'%')) ");

src/main/java/com/ssj/service/sys/fx/service/impl/MerchantServiceImpl.java

@@ -1550,8 +1550,6 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 					oldmerchant.setSignType(merchant.getSignType());
 				}
 				
-				this.save(oldmerchant);
-				
 				//商户同步学币/人数 到机构 / 时间
 				if(StringUtils.isNotEmpty(merchant.getLibId())) {
 					oldmerchant.setLibId(merchant.getLibId());
@@ -1564,6 +1562,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 					}	
 				}
 				
+				this.save(oldmerchant);
 				
 				if(isSignType || isMealType || isServiceMonth || isLibId) {
 					

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassStudentTempServiceImpl.java

@@ -97,7 +97,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 
 
 	@Override
-	public int insertTbClassStudent(TbLibJoin libJoin,TbClassStudentTemp tbLibImStudentTemp) {
+	public synchronized int insertTbClassStudent(TbLibJoin libJoin,TbClassStudentTemp tbLibImStudentTemp) {
 		int reqNum=1;
 		if(libJoin!=null){
 			tbLibImStudentTemp.setLibId(libJoin.getId());
@@ -125,7 +125,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 				
 				
 				int countVip=libVipService.countByLibId(libJoin.getId());
-				if(countVip>libJoin.getLibService()) {
+				if(countVip>=libJoin.getLibService()) {
 					tbLibImStudentTemp.setStatus(0);
 					tbLibImStudentTemp.setErrorReason("校区人数已达到上限不能新导入学生");
 					this.save(tbLibImStudentTemp);

src/main/java/com/ssj/sys/controller/AwardController.java

@@ -125,7 +125,7 @@ public class AwardController extends BaseController {
 		myColumns3.add(new ExcelColumn("奖品名称", "name", 20));
 		myColumns3.add(new ExcelColumn("等级", "level", 20));
 		myColumns3.add(new ExcelColumn("录入总库存", "stock_number", 20));
-		myColumns3.add(new ExcelColumn("已用库存", "use_number", 20));
+		myColumns3.add(new ExcelColumn("已用库存", "new_use_number", 20));
 		myColumns3.add(new ExcelColumn("未用库存", "not_use_number", 20));
 		myColumns3.add(new ExcelColumn("兑换积分", "exchange_integral", 20));
 		myColumns3.add(new ExcelColumn("市场价", "price", 20));

src/main/resources/templates/sys/award/material/list.html

@@ -102,7 +102,7 @@
 					</td>
 					<td >
 						<a style="color: red" href="javascript:;" th:href="@{/sys/award/sncode/list.html(awardMaterialId=${item.id},status='1;2;3;4' )}">
-							[[${item.get('use_number')}]]
+							[[${item.get('new_use_number')}]]
 						</a>
 					</td>
 					<td >