4

@@ -19,6 +19,7 @@ import com.cjs.site.biz.pub.CommonBiz;
 import com.cjs.site.dao.user.OrganInfoDao;
 import com.cjs.site.dao.user.account.ClientDao;
 import com.cjs.site.dao.user.account.ClientInfoDao;
+import com.cjs.site.dao.user.pick.PickPackDao;
 import com.cjs.site.model.pub.ConstInfo;
 import com.cjs.site.model.user.account.ClientInfo;
 import com.cjs.site.model.user.account.LoginVO;
@@ -64,6 +65,8 @@ public class PassportBiz {
     private OrganInfoDao  organInfoDao;
     @Autowired
     private JedisTemplate jedisTemplate;
+    @Autowired
+    private PickPackDao pickPackDao;
 
     /**
      * 登录
@@ -97,6 +100,8 @@ public class PassportBiz {
             }
             loginVO.setUsername(clientId.get(0));
         }
+        
+        //如果用户资金和库存都为0，则不允许登录
 
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("input_content", "1");//登录方式：账号
@@ -148,6 +153,12 @@ public class PassportBiz {
             userInfo.setOtc_account(StringUtil.castString(userDetail.get("otc_account")));
         }
         userInfo.setOrgan_flag(StringUtil.castString(t2r.getData().get(0).get("organ_flag")));
+        
+        Double amount = pickPackDao.queryUserAmount(loginVO.getUsername());
+        Integer total = pickPackDao.queryUserStock(loginVO.getUsername());
+        if((amount ==null || amount.compareTo(0.0) <1) &&(total==null || total <1)){
+        	throw new ServiceException("登录异常，请联系客服！谢谢！");
+        }
         return userInfo;
     }
 

@@ -33,4 +33,7 @@ public interface PickPackDao extends OracleDao {
     void ducueUserInventory(@Param("amount") Integer amount,@Param("otcCode")  String otcCode,@Param("userId")  String userId);
 
     void insertPick(Map<String,Object> map);
+    
+    public java.lang.Integer queryUserStock(String userId);
+    public java.lang.Double queryUserAmount(String userId);
 }

@@ -47,7 +47,15 @@
 	<update id="ducueUserInventory">
 		update hs_otc.otcstockreal  set current_amount = current_amount-#{amount} where client_id =#{userId} and otc_code=#{otcCode}
 	</update>
+	
+	<select id="queryUserStock" resultType="java.lang.Integer">
+			select sum(current_amount) as currentAmount from hs_otc.otcstockreal where client_id =#{userId} 
+	</select>
 
+	<select id="queryUserAmount" resultType="java.lang.Double">
+			select sum(current_amount) as currentAmount from hs_otc.otcstockreal where client_id =#{userId} 
+	</select>
+	
 	<insert id="insertPick" parameterType="java.util.HashMap">
 		insert into  HS_ASSET.OUTPROPAPPLY(
 		 OTC_CODE, OTC_NAME, OCCUR_AMOUNT, PICKING_DATE,

@@ -22,6 +22,8 @@
     height: 45px;
     display: inline-block;
     position: relative;
+	white-space: nowrap;
+	font-size: 20px;
 }
 
 .article h5 i{

@@ -84,13 +84,7 @@
     
     <div class="bottom-txt">
 		<p >客服电话：400-969-0800 工作日9:00-18:00</p>
-       	<p >版权所有 赵涌牛邮币卡交易平台 沪 ICP 备 14020580
-       	<p >
-	 		<a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011202003972" >
-	 			<img src="${ctx }/resource/images/logo/registerIcon.png" style="vertical-align: middle;" />
-	 			<span>沪公网安备 31011202003972号</span>
-	 		</a>
-	 	</p>
+       	<p >版权所有 上海顺宏金融信息服务有限公司 沪 ICP 备 14020580
  	</div>
 </div>
 

@@ -126,8 +126,8 @@
 			}
 		}else if(arr[3]=='trade'){
 			if(arr[4].split('?')[0]=='article'){
-				$("#message").addClass("headBar-seleced").siblings().removeClass("headBar-seleced");
-				$("#message").siblings().show()
+				$("#collocation").addClass("headBar-seleced").siblings().removeClass("headBar-seleced");
+				$("#collocation").siblings().show()
 			}else{
 				$("#collocation").addClass("headBar-seleced").siblings().removeClass("headBar-seleced");
 				$("#collocation").siblings().show()