Merge remote-tracking branch 'origin/master'

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/dao/sys/fx/dao/impl/FinanceQueryDaoImpl.java

@@ -445,13 +445,19 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          selSql.append(" ) AS derver_count");
          selSql.append(" from fx_merchant t ");
          selSql.append(" LEFT JOIN tb_lib_join j on t.lib_id=j.id ");
-         selSql.append(" where t.`status`!=4 and t.sign_type=0 and t.type in (1,2) ");
+         selSql.append(" where t.`status`!=4 and t.type in (1,2,6)  ");
+         selSql.append(" and (t.sign_type=0 OR t.id in (SELECT m.from_merchant_id from tb_lib_join_consume m WHERE m.type in (2,3)    ");
+         if(!StringUtil.isEmpty(params.get("startMonth"))){
+        	 selSql.append(" AND DATE_FORMAT(m.create_time,'%Y-%m')=?  ");
+             queryParams.add(params.get("startMonth"));
+         }
+         selSql.append(" GROUP BY m.from_merchant_id )) ");
          if(!StringUtil.isEmpty(params.get("unitName"))){
              selSql.append(" AND (t.unit_name LIKE concat('%',?,'%')  OR j.league_name LIKE concat('%',?,'%')  ) ");
              queryParams.add(params.get("unitName"));
              queryParams.add(params.get("unitName"));
          }
-         selSql.append(" ORDER BY FIELD(t.`type`,1,2),t.create_time asc ");
+         selSql.append(" ORDER BY FIELD(t.`type`,1,2,6),t.create_time asc ");
          selSql.append(" ) as tmp ");
          return dao.findPage(selSql.toString(),queryParams.toArray(),pageable);
 	}

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/service/task/SyncCreateQrSnCodeTask.java

@@ -48,7 +48,7 @@ public class SyncCreateQrSnCodeTask extends Task {
 		if (!f.exists()) {
 			f.mkdirs();
 		}
-		String url = frontUrl+"/dist/index.html?sncode="+snCode;
+		String url = frontUrl+"/lucky_draw/index.html?sncode="+snCode;
 		String userInfoUrl=AdvancedUtil.getuserinfourl(url);
 		String fPathId = fPath + snCode+".jpg";
 		try {

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/java/com/ssj/sys/controller/FxController.java

@@ -1806,6 +1806,12 @@ public class FxController  extends BaseController {
 					case "5":
 						str="直接签约(新模式)";
 						break;
+					case "6":
+						str="旧转新(新不结算)";
+						break;
+					case "7":
+						str="旧转新(新旧不结算)";
+						break;
 					default:
 						str="";
 						break;
@@ -2698,6 +2704,12 @@ public class FxController  extends BaseController {
 							case "5":
 								map.put("fm_type", "直接签约(新模式)");
 								break;
+							case "6":
+								map.put("fm_type", "旧转新(新不结算)");
+								break;
+							case "7":
+								map.put("fm_type", "旧转新(新旧不结算)");
+								break;
 							default:
 								map.put("fm_type", "");
 								break;
@@ -2719,6 +2731,12 @@ public class FxController  extends BaseController {
 							case "5":
 								map.put("tm_type", "直接签约(新模式)");
 								break;
+							case "6":
+								map.put("tm_type", "旧转新(新不结算)");
+								break;
+							case "7":
+								map.put("tm_type", "旧转新(新旧不结算)");
+								break;
 							default:
 								map.put("tm_type", "");
 								break;

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 >

src/main/resources/templates/sys/fx/consumeList.html

@@ -128,6 +128,8 @@
 					   <span th:case="3">外部签约</span>
 					   <span th:case="4">内部不结算(财务) </span>
 					   <span th:case="5">直接签约(新模式)</span>
+					   <span th:case="6">旧转新(新不结算)</span>
+					   <span th:case="7">旧转新(新旧不结算)</span>
 					</td>
 					<td th:text="${item.tm_unit_name}"></td>
 					<td th:text="${item.tj_league_name}"></td>
@@ -137,6 +139,8 @@
 					   <span th:case="3">外部签约</span>
 					   <span th:case="4">内部不结算(财务)</span>
 					   <span th:case="5">直接签约(新模式)</span>
+					   <span th:case="6">旧转新(新不结算)</span>
+					   <span th:case="7">旧转新(新旧不结算)</span>
 					</td>
 					<td style="color: red" th:switch="${item.type}">
 					   <span th:case="1">塾币充值【旧模式】</span>

src/main/resources/templates/sys/fx/merchantAdd.html

@@ -229,6 +229,8 @@ dtext{
 						<option value="3" th:selected="${merchant.type==3 ? true : false}">外部签约</option>
 						<option value="4" th:selected="${merchant.type==4 ? true : false}">内部不结算(财务)</option>
 						<option value="5" th:selected="${merchant.type==5 ? true : false}">直接签约(新模式)</option>
+						<option value="6" th:selected="${merchant.type==6 ? true : false}">旧转新(新不结算)</option>
+						<option value="7" th:selected="${merchant.type==7 ? true : false}">旧转新(新旧不结算)</option>
 					</select>
 				</div>
 			</li>
@@ -241,6 +243,8 @@ dtext{
 						<option value="2" th:selected="${merchant.type==2 ? true : false}">内部消耗</option>
 						<option value="4" th:selected="${merchant.type==4 ? true : false}">内部不结算(财务)</option>
 						<option value="5" th:selected="${merchant.type==5 ? true : false}">直接签约(新模式)</option>
+						<option value="6" th:selected="${merchant.type==6 ? true : false}">旧转新(新不结算)</option>
+						<option value="7" th:selected="${merchant.type==7 ? true : false}">旧转新(新旧不结算)</option>
 					</select>
 				</div>
 			</li>