导入

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

@@ -446,6 +446,9 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 	}
     
     
+    //加油的数量
+    private static int signLibService=5;
+    
 	//套餐模式 【1优选套餐 2VIP套餐 3尊享套餐】 4加油包月包+月 5加油包量包+量。
 	//现在暂时只记录加油的记录。
 	@Override
@@ -479,7 +482,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 				}
 				
 				merchantSign.setCreateTime(new Date());
-				merchantSign.setLibService(10);
+				merchantSign.setLibService(signLibService);
 				
 				merchantSign.setSignTime(cal.getTime());
 				cal.add(Calendar.MONTH, 1);
@@ -499,9 +502,8 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 				merchantSign.setStatus(2);
 			}
 			merchantSign.setCreateTime(new Date());
-			merchantSign.setLibService(10);
 			
-			merchantSign.setLibService(10*num);
+			merchantSign.setLibService(signLibService*num);
 			merchantSign.setSignTime(cal.getTime());
 			cal.add(Calendar.MONTH, 1);
 			merchantSign.setEndSignTime(cal.getTime());
@@ -521,7 +523,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 				TbLibJoinConsume consume=new TbLibJoinConsume();
 				consume.setToLibId(merchant.getLibId());
 				consume.setToMerchantId(merchant.getId());
-				consume.setLibService(10);
+				consume.setLibService(signLibService);
 				consume.setPlatformService(0);
 				consume.setType(9);
 				consume.setComputeNum(0);
@@ -535,7 +537,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 			TbLibJoinConsume consume=new TbLibJoinConsume();
 			consume.setToLibId(merchant.getLibId());
 			consume.setToMerchantId(merchant.getId());
-			consume.setLibService(10*num);
+			consume.setLibService(signLibService*num);
 			consume.setPlatformService(0);
 			consume.setType(9);
 			consume.setComputeNum(0);
@@ -555,7 +557,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 				consume=new TbLibJoinConsume();
 				consume.setFromLibId(merchant.getLibId());
 				consume.setFromMerchantId(merchant.getId());
-				consume.setLibService(10);
+				consume.setLibService(signLibService);
 				consume.setPlatformService(0);
 				consume.setType(10);
 				consume.setComputeNum(1);
@@ -569,7 +571,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 				consume=new TbLibJoinConsume();
 				consume.setFromLibId(merchant.getLibId());
 				consume.setFromMerchantId(merchant.getId());
-				consume.setLibService(10*num);
+				consume.setLibService(signLibService*num);
 				consume.setPlatformService(0);
 				consume.setType(10);
 				consume.setComputeNum(num);

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

@@ -27,6 +27,7 @@ import com.ssj.dao.sys.imlibuser.dao.TbClassStudentTempDao;
 import com.ssj.framework.basic.utils.DateHelper;
 import com.ssj.framework.core.common.service.BaseServiceImpl;
 import com.ssj.framework.core.security.manager.TokenManager;
+import com.ssj.framework.core.util.PasswordUtil;
 import com.ssj.framework.core.util.ResponseConstant;
 import com.ssj.framework.core.util.ResponseEntity;
 import com.ssj.framework.idworker.IdWorker;
@@ -158,8 +159,19 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 					user.setUserName(tbLibImStudentTemp.getParentName());
 					user.setMobile(tbLibImStudentTemp.getParentPhone());
 					user.setCreateTime(new Date());
+					user.setPassword("123456");
+					user.setPwdSalt(PasswordUtil.generateSalt());
+					user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
 					user=userService.save(user);
+				}else {
+//					if(StringUtils.isEmpty(user.getPassword())) {
+//						user.setPassword("123456");
+//						user.setPwdSalt(PasswordUtil.generateSalt());
+//						user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
+//						user=userService.save(user);
+//					}
 				}
+				
 				LibVip libVip=null;
 				List<LibVip> libVips=vipService.findByUserIdAndChildNames(user.getId(), tbLibImStudentTemp.getStudentName());
 				if(libVips!=null && libVips.size()>=2) {

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

@@ -433,7 +433,7 @@ public class FinanceReportController extends BaseController {
         Page<Map<String,Object>> page = financeService.balanceConsumeDetailList_New(params, initPage(pageNo, pageSize));
         List<Map<String,Object>> list=page.getContent();
         for (Map<String, Object> map : list) {
-        	map.put("price_1", "700");
+        	map.put("price_1", "350");
           	map.put("sum_price_1", "0");
         	map.put("sum_price_2", "0");
         	map.put("sum_price_3", "0");
@@ -579,7 +579,7 @@ public class FinanceReportController extends BaseController {
             
             List<Map<String,Object>> list=page.getContent();
             for (Map<String, Object> map : list) {
-            	map.put("price_1", "700");
+            	map.put("price_1", "350");
               	map.put("sum_price_1", "0");
             	map.put("sum_price_2", "0");
             	map.put("sum_price_3", "0");

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

@@ -104,7 +104,7 @@
 					<td th:text="${item.get('count_1')>0 ? item.get('balance_month') : ''   }"></td>
 					<td th:text="${item.get('sum_price_1')}"></td>
 	
-					<td th:text="${item.get('count_2')>0 ? '700' : '0' }"></td>
+					<td th:text="${item.get('count_2')>0 ? '350' : '0' }"></td>
 <!-- 					<td th:text="${item.get('sum_3')}"></td> -->
 <!-- 					<td th:text="${item.get('sum_4')}"></td> -->
 					<td th:text="${item.get('count_2')>0 ? item.get('balance_month') : ''   }"></td>
@@ -164,6 +164,14 @@
 	</ul>
 
 
+<ul style="margin-bottom: 100px;margin-top:10px;margin-left: 10px;">
+	<li style="line-height: 25px;">
+		<span style="font-size: 14px;">结算逻辑讲述</span>
+	</li>
+	<li style="line-height: 25px;color: red;">
+		商户开通服务包，服务包决定服务的总人数，商户管理中可通过设置"充值月份数"数量来充值所需的月数，"激活开始日期"在此日期之前商户绑定的机构不可以正常使用服务，"当前日期">"激活开始日期"
+	</li>	
+</ul>
 </body>
 	
 	

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

@@ -130,6 +130,34 @@
    	</div>
 </div>
 
+<ul style="margin-bottom: 100px;margin-left: 20px;">
+		<li style="line-height: 25px;">
+			<span style="font-size: 14px;">操作名词解释</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">物流状态：操作库存的物流状态。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">批次编号：操作库存的批次编号，点击编号可查看此批次的明细列表。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">批次总量：此批次的总数量。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">始商户：操作来自的商户。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">至商户：操作发至的商户。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">快递：物流快递信息数据。</span>
+		</li>
+
+
+	</ul>
+
+
+
 <script type="text/javascript">
 
 $(function(){

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

@@ -97,6 +97,39 @@
     	<div class="message">共<i class="blue">[[${page.rowCnt}]]</i>条记录，当前显示第&nbsp;<i class="blue">[[${page.pageNo }]]&nbsp;</i>页</div>
     	<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
    	</div>
+   	
+   	
+   	<ul style="margin-bottom: 100px;margin-left: 20px;">
+		<li style="line-height: 25px;">
+			<span style="font-size: 14px;">操作名词解释</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">日期：操作月份。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">供应商：配件供应商。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">收货商：配件收货商。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">收货内容：配件名称</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">入库数量：配件入库数量</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">验收回退：配件回退数量</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">当期结存：当期入库数量-期验收回退</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">累计库存：总入库数量-总验收回退</span>
+		</li>
+	</ul>
+   	
+   	
 
 </div>
 </body>

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

@@ -90,6 +90,37 @@
 		<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
 	</div>
 
+   	<ul style="margin-bottom: 100px;margin-left: 20px;">
+		<li style="line-height: 25px;">
+			<span style="font-size: 14px;">操作名词解释</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">日期：操作月份。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">供应商：配件供应商。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">收货内容：配件名称</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">出库数量：配件出库数量</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">销售单价：配件的单价</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">出库退回：当期退回数量</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">当月出库：当期出库数量</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">累计出库：总出库数量</span>
+		</li>
+	</ul>
+
+
 </div>
 </body>
 <script type="text/javascript">

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

@@ -316,11 +316,11 @@
 		        	<ul class="fwmc_xxk">
 		            <li class="sign_type_select sign_type_select_on" data-type="4">
 		              <p>加油包-月包</p>
-		              1个月<i>/10人</i>
+		              1个月<i>/5人</i>
 		           	</li>
 		           	<li class="sign_type_select"  data-type="5">
 		              <p>加油包-数量包</p>
-		              10人<i>/1个月</i>
+		              5人<i>/1个月</i>
 		           	</li>
 		          </ul>
 		        </td>
@@ -384,6 +384,50 @@
     	<div th:utext='${listNavigatHtml}' th:remove="tag" ></div>
    	</div>
 </div>
+
+
+
+
+<ul style="margin-bottom: 100px;margin-left: 20px;">
+		<li style="line-height: 25px;">
+			<span style="font-size: 14px;">操作名词解释</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">关联机构：商户关联的机构名称，可通过操作解绑，修改重新绑定新机构。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">商户套餐：商户开通的服务套餐。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">商户模式：商户开通的服务包，服务包决定机构服务的人数。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">服务人数/塾币：现在可以服务的人数。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">旧转新余币	：当商户发生旧转新模式时，会保存旧模式最后一时刻的余币数量。</span>
+		</li>
+		<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">充值/已结算(月份)：充值=充值的几个月，已结算=现已正常结算的次数。如0/0时，表示此商户服务包已过期。</span>
+		</li>
+			<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">激活开始日期：商户可以使用服务包的开始日期。</span>
+		</li>
+		</li>
+			<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">激活结束日期：商户真正开始进入结算的日期。</span>
+		</li>
+		</li>
+			<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">计费开始日	：免费期之后，商户真正开始进入结算的日期。</span>
+		</li>
+		</li>
+			<li style="line-height: 25px;color: red;">
+			<span style="font-size: 14px;">下个结算日：商户下一个发生结算的日期。</span>
+		</li>
+
+	</ul>
+
 </body>