旧转新

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

@@ -1540,6 +1540,10 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 							oldmerchant.setLibService(100+signNum);
 							oldmerchant.setPortNum(400);
 							break;
+						case 4:
+							oldmerchant.setLibService(20+signNum);
+							oldmerchant.setPortNum(200);
+							break;
 						default:
 							oldmerchant.setLibService(0);
 							oldmerchant.setPortNum(0);
@@ -1551,16 +1555,16 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				}
 				
 				//商户同步学币/人数 到机构 / 时间
-				if(StringUtils.isNotEmpty(merchant.getLibId())) {
-					oldmerchant.setLibId(merchant.getLibId());
-					TbLibJoin  libJoin= libJoinService.getById(oldmerchant.getLibId());
-					if(libJoin!=null) {
-						libJoin.setLibService(oldmerchant.getLibService());
-						libJoin.setPlatformService(oldmerchant.getPlatformService());
-						
-						libJoinService.save(libJoin);
-					}	
-				}
+//				if(StringUtils.isNotEmpty(merchant.getLibId())) {
+//					oldmerchant.setLibId(merchant.getLibId());
+//					TbLibJoin  libJoin= libJoinService.getById(oldmerchant.getLibId());
+//					if(libJoin!=null) {
+//						libJoin.setLibService(oldmerchant.getLibService());
+//						libJoin.setPlatformService(oldmerchant.getPlatformService());
+//						
+//						libJoinService.save(libJoin);
+//					}	
+//				}
 				
 				this.save(oldmerchant);
 				
@@ -1678,6 +1682,9 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 					case 3:
 						merchant.setLibService(100);
 						merchant.setPortNum(400);
+					case 4:
+						merchant.setLibService(20);
+						merchant.setPortNum(200);
 						break;
 					default:
 						merchant.setLibService(0);
@@ -1714,15 +1721,15 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				}
 				
 				//商户同步学币/人数 到机构 / 时间
-				if(StringUtils.isNotEmpty(merchant.getLibId())) {
-					TbLibJoin  libJoin= libJoinService.getById(merchant.getLibId());
-					if(libJoin!=null) {
-						libJoin.setLibService(merchant.getLibService());
-						libJoin.setPlatformService(merchant.getPlatformService());
-						
-						libJoinService.save(libJoin);
-					}	
-				}
+//				if(StringUtils.isNotEmpty(merchant.getLibId())) {
+//					TbLibJoin  libJoin= libJoinService.getById(merchant.getLibId());
+//					if(libJoin!=null) {
+//						libJoin.setLibService(merchant.getLibService());
+//						libJoin.setPlatformService(merchant.getPlatformService());
+//						
+//						libJoinService.save(libJoin);
+//					}	
+//				}
 				
 				
 				//记录开通商户记录

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

@@ -614,6 +614,8 @@ public class FinanceReportController extends BaseController {
             				map.put("sign_type", "服务包2");
             			}else if(Integer.parseInt(map.get("sign_type").toString())==3){
             				map.put("sign_type", "服务包3");
+            			}else if(Integer.parseInt(map.get("sign_type").toString())==4){
+            				map.put("sign_type", "服务包4");
             			}else {
             				map.put("sign_type", "");
             			}

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

@@ -2078,6 +2078,16 @@ public class FxController  extends BaseController {
 						}
 						libService_1=obj.getLibService()+"";
 						break;
+					case "4":
+						str="服务包4";
+						monthStr=obj.getLibServiceMonth()+"/"+obj.getCurIsSummary();
+						startActiveTimeStr=DateHelper.format(obj.getStartActiveTime(), "yyyy-MM-dd") ;
+						activeTimeStr=DateHelper.format(obj.getActiveTime(), "yyyy-MM-dd") ;
+						if(obj.getComputeTime()!=null) {
+							computeTimeStr=DateHelper.format(obj.getComputeTime(), "yyyy-MM-dd") ;
+						}
+						libService_1=obj.getLibService()+"";
+						break;
 					default:
 						str="";
 						monthStr="";
@@ -2279,6 +2289,16 @@ public class FxController  extends BaseController {
 						}
 						libService_1=obj.getLibService()+"";
 						break;
+					case "4":
+						str="服务包4";
+						monthStr=obj.getLibServiceMonth()+"/"+obj.getCurIsSummary();
+						startActiveTimeStr=DateHelper.format(obj.getStartActiveTime(), "yyyy-MM-dd") ;
+						activeTimeStr=DateHelper.format(obj.getActiveTime(), "yyyy-MM-dd") ;
+						if(obj.getComputeTime()!=null) {
+							computeTimeStr=DateHelper.format(obj.getComputeTime(), "yyyy-MM-dd") ;
+						}
+						libService_1=obj.getLibService()+"";
+						break;
 					default:
 						str="";
 						monthStr="";

src/main/resources/templates/sys/finance/allList6.html

@@ -96,6 +96,7 @@
 					   <span th:case="1" >服务包1</span>
 					   <span th:case="2" >服务包2</span>
 					   <span th:case="3" >服务包3</span>
+					   <span th:case="4" >服务包4</span>
 					</td>
 					<td th:text="${item.get('count_1')>0 ? item.get('price') : '0' }"></td>
 <!-- 					<td th:text="${item.get('sum_1')}"></td> -->

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

@@ -142,6 +142,7 @@ dtext{
 						<option value="1" th:selected="${merchant.signType==1 ? true : false}">服务包1</option>
 						<option value="2" th:selected="${merchant.signType==2 ? true : false}">服务包2</option>
 						<option value="3" th:selected="${merchant.signType==3 ? true : false}">服务包3</option>
+						<option value="4" th:selected="${merchant.signType==4 ? true : false}">服务包4</option>
 					</select>
 				</div>
 				<text th:if="${merchant.id!=null}"  style="width: 230px;color:red">[修改套餐模式,不会影响加油包有效性 ]</text>

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

@@ -227,6 +227,7 @@
 					   <span th:case="1" >服务包1</span>
 					   <span th:case="2" >服务包2</span>
 					   <span th:case="3" >服务包3</span>
+					   <span th:case="4" >服务包4</span>
 					   <span th:case="*" style="color:red">旧兼容模式</span>
 					</td>
 					
@@ -237,8 +238,8 @@
 					
 					<td th:title="${item.signTime!=null ?  #dates.format(item.signTime, 'yyyy-MM-dd')+'~'+#dates.format(item.endSignTime, 'yyyy-MM-dd') : '--' }"  th:text="${item.signTime!=null ?  #dates.format(item.signTime, 'yyyy-MM-dd')+'~'+#dates.format(item.endSignTime, 'yyyy-MM-dd') : '--' }"></td>
 					<td >
-					   <span th:if="${item.libServiceMonth>0  && ( item.signType==1 || item.signType==2 || item.signType==3 )}"  style="color: red">[[${item.libServiceMonth +' / '+ item.curIsSummary}]]</span>
-					   <span th:if="${item.nextSummaryTime==null && ( item.signType==1 || item.signType==2 || item.signType==3 )}" >已结清</span>
+					   <span th:if="${item.libServiceMonth>0  && ( item.signType==1 || item.signType==2 || item.signType==3 || item.signType==4 )}"  style="color: red">[[${item.libServiceMonth +' / '+ item.curIsSummary}]]</span>
+					   <span th:if="${item.nextSummaryTime==null && ( item.signType==1 || item.signType==2 || item.signType==3  || item.signType==4)}" >已结清</span>
 					</td>
 					<td  th:text="${#calendars.format(item.startActiveTime,'yyyy-MM-dd')}" ></td> 
 					<td  th:text="${#calendars.format(item.activeTime,'yyyy-MM-dd')}" ></td> 

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

@@ -137,6 +137,7 @@ dtext{
 						<option value="1" th:selected="${merchant.signType==1 ? true : false}">服务包1</option>
 						<option value="2" th:selected="${merchant.signType==2 ? true : false}">服务包2</option>
 						<option value="3" th:selected="${merchant.signType==3 ? true : false}">服务包3</option>
+						<option value="4" th:selected="${merchant.signType==4 ? true : false}">服务包4</option>
 					</select>
 				</div>
 				<text th:if="${merchant.id!=null}"  style="width: 230px;color:red">[修改套餐模式,不会影响加油包有效性 ]</text>

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

@@ -210,6 +210,7 @@
 					   <span th:case="1" >服务包1</span>
 					   <span th:case="2" >服务包2</span>
 					   <span th:case="3" >服务包3</span>
+					   <span th:case="4" >服务包4</span>
 					   <span th:case="*" style="color:red">旧兼容模式</span>
 					</td>
 					
@@ -219,8 +220,8 @@
 					
 					<td th:title="${item.signTime!=null ?  #dates.format(item.signTime, 'yyyy-MM-dd')+'~'+#dates.format(item.endSignTime, 'yyyy-MM-dd') : '--' }"  th:text="${item.signTime!=null ?  #dates.format(item.signTime, 'yyyy-MM-dd')+'~'+#dates.format(item.endSignTime, 'yyyy-MM-dd') : '--' }"></td>
 					<td >
-					   <span th:if="${item.libServiceMonth>0  && ( item.signType==1 || item.signType==2 || item.signType==3 )}"  style="color: red">[[${item.libServiceMonth +' / '+ item.curIsSummary}]]</span>
-					   <span th:if="${item.nextSummaryTime==null && ( item.signType==1 || item.signType==2 || item.signType==3 )}" >已结清</span>
+					   <span th:if="${item.libServiceMonth>0  && ( item.signType==1 || item.signType==2 || item.signType==3 || item.signType==4 )}"  style="color: red">[[${item.libServiceMonth +' / '+ item.curIsSummary}]]</span>
+					   <span th:if="${item.nextSummaryTime==null && ( item.signType==1 || item.signType==2 || item.signType==3 || item.signType==4 )}" >已结清</span>
 					</td>
 					<td  th:text="${#calendars.format(item.startActiveTime,'yyyy-MM-dd')}" ></td> 
 					<td  th:text="${#calendars.format(item.activeTime,'yyyy-MM-dd')}" ></td> 

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

@@ -137,6 +137,7 @@ dtext{
 						<option value="1" th:selected="${merchant.signType==1 ? true : false}">服务包1</option>
 						<option value="2" th:selected="${merchant.signType==2 ? true : false}">服务包2</option>
 						<option value="3" th:selected="${merchant.signType==3 ? true : false}">服务包3</option>
+						<option value="4" th:selected="${merchant.signType==4 ? true : false}">服务包4</option>
 					</select>
 				</div>
 				<text th:if="${merchant.id!=null}"  style="width: 230px;color:red">[修改套餐模式,不会影响加油包有效性 ]</text>