Merge branch 'LeoN' into test

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashOasBox.java

@@ -71,6 +71,8 @@ public class FosterwxCashOasBox extends Model<FosterwxCashOasBox> {
 
     private Integer fobiddenStatus;
 
+    private Integer sendTextCnt;
+
     /**
      * 备注
      */

src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashOasBoxService.java

@@ -18,7 +18,7 @@ public interface FosterwxCashOasBoxService extends IService<FosterwxCashOasBox>
     //.@leon 获取数据列表
     public ResHandle<List<FosterwxCashOasBox>> getList(PostBasePageHandle handle);
     //.@leon 获取一个正常状态的小程序
-    public FosterwxCashOasBox getRandBox();
+    public FosterwxCashOasBox getRandBox(Integer groupId);
     //.@leon 获取一个正常状态的公众号
-    public FosterwxCashOasBox getRandOas();
+    public FosterwxCashOasBox getRandOas(Integer groupId);
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxServiceImpl.java

@@ -50,9 +50,11 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
      * 获取一个有效的小程序
      * @return
      */
-    public FosterwxCashOasBox getRandBox() {
+    public FosterwxCashOasBox getRandBox(Integer groupId) {
         List<FosterwxCashOasBox> list = this.list(new QueryWrapper<FosterwxCashOasBox>()
                 .eq("type", 1)
+                .eq("group_id",groupId)
+                .lt("send_text_cnt",90)
                 .eq("fobidden_status",1));
         if (list == null || list.size() <= 0) {
             return null;
@@ -68,9 +70,11 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
      * 获取一个有效的公众号
      * @return
      */
-    public FosterwxCashOasBox getRandOas() {
+    public FosterwxCashOasBox getRandOas(Integer groupId) {
         List<FosterwxCashOasBox> list = this.list(new QueryWrapper<FosterwxCashOasBox>()
                 .eq("type", 2)
+                .eq("group_id",groupId)
+                .lt("send_text_cnt",90)
                 .eq("fobidden_status",1));
         if (list == null || list.size() <= 0) {
             return null;