bug修复

src/custom/restcontroller/common/usercenter/usercenter.java

@@ -395,7 +395,7 @@ public class usercenter extends Controller {
             updateSQL.update();
             if (usertype == 99) {
 
-                new StoreHelper().updateUserType22(this);
+                new StoreHelper().updateUserType22(this,userid);
             }
 
         }
@@ -407,7 +407,7 @@ public class usercenter extends Controller {
             updateSQL.setValue("userid", 0);
             updateSQL.update();
             if (usertype == 22) {
-                new StoreHelper().updateUserType99(this);
+                new StoreHelper().updateUserType99(this,userid);
             }
         }
         dbConnect.runSqlUpdate(sqllist);
@@ -443,7 +443,7 @@ public class usercenter extends Controller {
         updateSQL.update();
 
         if (usertype == 99) {
-            new StoreHelper().updateUserType1(this);
+            new StoreHelper().updateUserType1(this,userid);
         }
 
 

src/custom/restcontroller/webmanage/saletool/store/StoreHelper.java

@@ -70,75 +70,75 @@ public class StoreHelper extends BaseClass {
     }
 
     //改为经销商员工类型
-    public void updateUserType22(Controller controller) throws YosException {
-        updateUserType(controller, 22);
+    public void updateUserType22(Controller controller,Long userid) throws YosException {
+        updateUserType(controller, userid,22);
 
         ArrayList<Long> deleteroles = dbConnect.runSqlQuery("SELECT visitor_roleid from sys_wechatapp WHERE (systemclient='"
                 + controller.systemclient + "' or systemclient_auth='" + controller.systemclient + "' ) and  siteid='" + controller.siteid + "'  and isvisitor=1").toArrayList("visitor_roleid", new ArrayList<>());
 
         if (deleteroles.size() > 0) {
-            deleteUserRole(controller, deleteroles);
+            deleteUserRole(controller, userid,deleteroles);
         }
 
         Rows rows = dbConnect.runSqlQuery("select * from sys_role where rolename='" + Parameter.get("storerolename") + "' and siteid='" + controller.siteid + "'");
         if (rows.isNotEmpty()) {
-            insertUserRole(controller, rows.get(0).getLong("roleid"));
+            insertUserRole(controller,userid, rows.get(0).getLong("roleid"));
         }
     }
 
-    public void updateUserType1(Controller controller) throws YosException {
-        updateUserType(controller, 1);
+    public void updateUserType1(Controller controller,Long userid) throws YosException {
+        updateUserType(controller,userid, 1);
 
         ArrayList<Long> deleteroles = dbConnect.runSqlQuery("SELECT visitor_roleid from sys_wechatapp WHERE (systemclient='"
                 + controller.systemclient + "' or systemclient_auth='" + controller.systemclient + "' ) and  siteid='" + controller.siteid + "'  and isvisitor=1").toArrayList("visitor_roleid", new ArrayList<>());
 
         if (deleteroles.size() > 0) {
-            deleteUserRole(controller, deleteroles);
+            deleteUserRole(controller,userid, deleteroles);
         }
 
         Rows rows = dbConnect.runSqlQuery("select * from sys_role where issystem=1 and usertype=1 and siteid='" + controller.siteid + "'");
         if (rows.isNotEmpty()) {
-            insertUserRole(controller, rows.get(0).getLong("roleid"));
+            insertUserRole(controller,userid, rows.get(0).getLong("roleid"));
         }
     }
 
-    public void updateUserType99(Controller controller) throws YosException {
-        updateUserType(controller, 99);
+    public void updateUserType99(Controller controller,Long userid) throws YosException {
+        updateUserType(controller, userid,99);
 
         ArrayList<Long> deleteroles = dbConnect.runSqlQuery("select * from sys_role where rolename='" + Parameter.get("storerolename") + "' and siteid='" + controller.siteid + "'").toArrayList("roleid", new ArrayList<>());
 
         if (deleteroles.size() > 0) {
-            deleteUserRole(controller, deleteroles);
+            deleteUserRole(controller,userid, deleteroles);
         }
         Rows rows = dbConnect.runSqlQuery("SELECT visitor_roleid from sys_wechatapp WHERE (systemclient='" + controller.systemclient + "' or systemclient_auth='" + controller.systemclient + "' ) and  siteid='" + controller.siteid + "'  and isvisitor=1");
 
         if (rows.isNotEmpty()) {
-            insertUserRole(controller, rows.get(0).getLong("visitor_roleid"));
+            insertUserRole(controller,userid, rows.get(0).getLong("visitor_roleid"));
         }
     }
 
 
-    public void updateUserType(Controller controller, int usertype) throws YosException {
+    public void updateUserType(Controller controller,Long userid, int usertype) throws YosException {
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(controller, "sys_usersite");
         updateSQL.setSiteid(controller.siteid);
-        updateSQL.setWhere("userid", controller.userid);
+        updateSQL.setWhere("userid", userid);
         updateSQL.setValue("usertype", usertype);
         updateSQL.update();
     }
 
-    public void deleteUserRole(Controller controller, ArrayList<Long> deleteroles) throws YosException {
+    public void deleteUserRole(Controller controller,Long userid, ArrayList<Long> deleteroles) throws YosException {
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(controller, "sys_userrole");
         deleteSQL.setSiteid(controller.siteid);
-        deleteSQL.setWhere("userid", controller.userid);
+        deleteSQL.setWhere("userid", userid);
         deleteSQL.setWhere("roleid", deleteroles);
         deleteSQL.delete();
     }
 
-    public void insertUserRole(Controller controller, Long roleid) throws YosException {
+    public void insertUserRole(Controller controller,Long userid, Long roleid) throws YosException {
         InsertSQL insertSQL = SQLFactory.createInsertSQL(controller, "sys_userrole");
         insertSQL.setSiteid(controller.siteid);
         insertSQL.setUniqueid(createTableID("sys_userrole"));
-        insertSQL.setValue("userid", controller.userid);
+        insertSQL.setValue("userid",userid);
         insertSQL.setValue("roleid", roleid);
         insertSQL.insert();
     }

src/custom/restcontroller/webmanage/saletool/store/StoreTeam.java

@@ -256,21 +256,11 @@ public class StoreTeam extends Controller {
             return getErrReturnObject().setErrMsg("启用停用失败，未找到对应角色").toString();
         }
 
-        long roleid = rows.get(0).getLong("roleid");
 
         if (enable) {
-            InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sys_userrole");
-            insertSQL.setUniqueid(createTableID("sys_userrole"));
-            insertSQL.setSiteid(siteid);
-            insertSQL.setValue("userid", userid);
-            insertSQL.setValue("roleid", roleid);
-            insertSQL.insert();
+            new StoreHelper().updateUserType22(this,userid);
         } else {
-            DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sys_userrole");
-            deleteSQL.setSiteid(siteid);
-            deleteSQL.setWhere("userid", userid);
-            deleteSQL.setWhere("roleid", roleid);
-            deleteSQL.delete();
+            new StoreHelper().updateUserType99(this,userid);
         }
 
 
@@ -313,7 +303,7 @@ public class StoreTeam extends Controller {
 
         if (usertype == 99) {
             //变更用户类型（消费者类型调整为经销商员工类型）
-            new StoreHelper().updateUserType22(this);
+            new StoreHelper().updateUserType22(this,userid);
 
         }
 

src/custom/restcontroller/webmanage/users/visitors.java

@@ -49,8 +49,8 @@ public class visitors extends Controller {
         //订单
         rows = dbConnect.runSqlQuery("SELECT count(*) count from sa_custorder WHERE createuserid=" + userid + " and siteid='" + siteid + "' and deleted=0");
         row.put("count_order", rows.get(0).getLong("count"));
-        rows = dbConnect.runSqlQuery("SELECT count(*) count from sys_phonebook WHERE sys_phonebookgroupid in (SELECT sys_phonebookgroupid from sys_phonebookgroup WHERE classid=1) and siteid='"+siteid+"'");
         //  通讯录
+        rows = dbConnect.runSqlQuery("SELECT count(*) count from sys_phonebook WHERE sys_phonebookgroupid in (SELECT sys_phonebookgroupid from sys_phonebookgroup WHERE classid=1) and siteid='"+siteid+"'");
         row.put("count_addressbook",  rows.get(0).getLong("count"));
         //考试成绩
         rows = dbConnect.runSqlQuery("SELECT count(*) count from sat_courseware_test WHERE userid=" + userid + " and siteid='" + siteid + "' ");
@@ -61,6 +61,10 @@ public class visitors extends Controller {
         // 意见反馈
         row.put("count_feedback",  rows.get(0).getLong("count"));
 
+        rows = dbConnect.runSqlQuery("SELECT count(*) count from sa_awardmx WHERE createuserid=" + userid + " and siteid='" + siteid + "' ");
+        // 中奖明细
+        row.put("count_awardmx",  rows.get(0).getLong("count"));
+
         row.putAll(getUser(userid));
         row.put("headpic", getHeadPic(userid));
         row.put("attinfos", Attachment.get(this, "sys_users", userid, "headportrait"));