.

src/main/java/com/thmodel/dao/ModelInfoDao.java

@@ -194,7 +194,7 @@ public interface ModelInfoDao {
      * @param likeName
      * @return
      */
-    public Map<String, Object> findModelInfoByName(int memberpk, String likeName, int index, int size);
+    public Map<String, Object> findModelInfoByName(int memberpk, String likeName, int index, int size,String area);
 
     /**
      * 根据人才Pk查询人才图片列表
@@ -317,7 +317,7 @@ public interface ModelInfoDao {
      * @param typeName
      * @return
      */
-    public Map<String, Object> findDataTypeInfoByPkOrTypeName(int memberpk, String pks, String typeName, int index, int sizes);
+    public Map<String, Object> findDataTypeInfoByPkOrTypeName(int memberpk, String pks, String typeName, String area, int index, int sizes);
 
 
     /**

src/main/java/com/thmodel/dao/impl/ModelInfoDaoImpl.java

@@ -34,6 +34,7 @@ import com.thmodel.page.Page;
 import com.thmodel.service.MemberinfoService;
 import com.thmodel.service.impl.MemberinfoServiceImpl;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.jooq.*;
 import org.jooq.impl.DSL;
 
@@ -574,11 +575,18 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
     }
 
     @Override
-    public Map<String, Object> findModelInfoByName(int memberpk, String likeName, int index, int size) {
+    public Map<String, Object> findModelInfoByName(int memberpk, String likeName, int index, int size, String area) {
         String whereSql = null;
         if (likeName != null && !likeName.equals("")) {
             whereSql = " (b.pet like '%" + likeName + "%' or m.Stage like '%" + likeName + "%')";
         }
+        if ("烟台".equals(area)) {
+            if (StringUtils.isNotEmpty(whereSql)) {
+                whereSql += " and b.Area=80 ";
+            } else {
+                whereSql = " b.Area=80 ";
+            }
+        }
         List<ModelInfo> list = modelInfoAndPhotoInfoList(memberpk, whereSql, true, index, size);
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -904,11 +912,19 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
     }
 
     @Override
-    public Map<String, Object> findDataTypeInfoByPkOrTypeName(int memberpk, String pks, String typeName, int index, int size) {
+    public Map<String, Object> findDataTypeInfoByPkOrTypeName(int memberpk, String pks, String typeName, String area, int index, int size) {
         try {
             Map<String, Object> resultMap = new HashMap<String, Object>();
             String whereSql = " m.pk in(select distinct modelpk from modelprice where skillpk in (" + pks + ")) ";
 
+            if ("烟台".equals(area)) {
+                if (StringUtils.isNotEmpty(whereSql)) {
+                    whereSql += " and b.Area=80' ";
+                } else {
+                    whereSql = " b.Area=80' ";
+                }
+            }
+
             List<ModelInfo> modelInfoList = modelInfoAndPhotoInfoList(memberpk, whereSql, true, index, size);
 
             //获取总数量
@@ -1850,17 +1866,17 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
 
         Result<Record4<Integer, String, String, Serializable>> result =
                 ctx.select(MEMBERINFO.PK.as("pk"), MEMBERINFO.PET.as("name"), MEMBERINFO.HPHOTO.as("avatar"), sumField)
-                        .from(MODELINFO)
-                        .innerJoin(MEMBERINFO)
-                        .on(MODELINFO.MEMBERPK.equal(MEMBERINFO.PK))
-                        .leftJoin(ACCOUNTRECORD)
-                        .on(ACCOUNTRECORD.MEMBERPK.equal(MEMBERINFO.PK))
-                        .and(ACCOUNTRECORD.ADATE.greaterOrEqual(Timestamp.valueOf(LocalDateTime.now().minusDays(day))))
-                        .and(ACCOUNTRECORD.ATYPE.in(AccountConstants.ACCOUNTRECORD_INCOME_TYPES))
-                        .groupBy(MEMBERINFO.PK)
-                        .orderBy(sumField.desc())
-                        .limit(20)
-                        .fetch();
+                   .from(MODELINFO)
+                   .innerJoin(MEMBERINFO)
+                   .on(MODELINFO.MEMBERPK.equal(MEMBERINFO.PK))
+                   .leftJoin(ACCOUNTRECORD)
+                   .on(ACCOUNTRECORD.MEMBERPK.equal(MEMBERINFO.PK))
+                   .and(ACCOUNTRECORD.ADATE.greaterOrEqual(Timestamp.valueOf(LocalDateTime.now().minusDays(day))))
+                   .and(ACCOUNTRECORD.ATYPE.in(AccountConstants.ACCOUNTRECORD_INCOME_TYPES))
+                   .groupBy(MEMBERINFO.PK)
+                   .orderBy(sumField.desc())
+                   .limit(20)
+                   .fetch();
         for (int i = 0; i < result.size(); i++) {
             JSONObject jsonObject = DBRecordsPack.Pack(result.get(i));
             jsonObject.put("rank", i + 1);
@@ -1870,18 +1886,18 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
 
         Field<Object> f =
                 ctx.select(ifnull(sum(ACCOUNTRECORD.COIN), 0))
-                        .from(ACCOUNTRECORD)
-                        .where(ACCOUNTRECORD.MEMBERPK.equal(MEMBERINFO.PK))
-                        .and((ACCOUNTRECORD.ADATE.greaterOrEqual(Timestamp.valueOf(LocalDateTime.now().minusDays(day)))))
-                        .and(ACCOUNTRECORD.ATYPE.in(AccountConstants.ACCOUNTRECORD_INCOME_TYPES))
-                        .asField("coin");
+                   .from(ACCOUNTRECORD)
+                   .where(ACCOUNTRECORD.MEMBERPK.equal(MEMBERINFO.PK))
+                   .and((ACCOUNTRECORD.ADATE.greaterOrEqual(Timestamp.valueOf(LocalDateTime.now().minusDays(day)))))
+                   .and(ACCOUNTRECORD.ATYPE.in(AccountConstants.ACCOUNTRECORD_INCOME_TYPES))
+                   .asField("coin");
         Record4<Integer, String, String, Object> record =
                 ctx.select(MEMBERINFO.PK.as("pk"), MEMBERINFO.PET.as("name"), MEMBERINFO.HPHOTO.as("avatar"), f)
-                        .from(MODELINFO)
-                        .innerJoin(MEMBERINFO)
-                        .on(MODELINFO.MEMBERPK.equal(MEMBERINFO.PK))
-                        .where(MODELINFO.MEMBERPK.equal(memberpk))
-                        .fetchOne();
+                   .from(MODELINFO)
+                   .innerJoin(MEMBERINFO)
+                   .on(MODELINFO.MEMBERPK.equal(MEMBERINFO.PK))
+                   .where(MODELINFO.MEMBERPK.equal(memberpk))
+                   .fetchOne();
         if (record != null) {
             map.put("myRank", DBRecordsPack.Pack(record));
         }
@@ -1893,9 +1909,9 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
     public boolean setOnline(int modelpk, int state) {
         DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
         int num = ctx.update(MODELINFO)
-                .set(MODELINFO.IS_A, state)
-                .where(MODELINFO.PK.equal(modelpk))
-                .execute();
+                     .set(MODELINFO.IS_A, state)
+                     .where(MODELINFO.PK.equal(modelpk))
+                     .execute();
         ctx.close();
         return num > 0;
     }
@@ -1904,8 +1920,8 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
     public boolean applyRecommend(int modelpk) {
         DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
         int num = ctx.insertInto(RECOMMEND_APPLY, RECOMMEND_APPLY.MODELPK)
-                .values(modelpk)
-                .execute();
+                     .values(modelpk)
+                     .execute();
         ctx.close();
         return num > 0;
     }
@@ -1922,13 +1938,13 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
     public List<JSONObject> fans(int modelPK, int page, int size) {
         DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
         List<JSONObject> list = DBRecordsPack.Pack(ctx.select(MEMBERINFO.fields())
-                .from(MODELFAN)
-                .join(MEMBERINFO)
-                .on(MODELFAN.MEMBERPK.equal(MEMBERINFO.PK))
-                .where(MODELFAN.MODELPK.equal(modelPK))
-                .orderBy(MODELFAN.PK.desc())
-                .limit((page - 1) * size, size)
-                .fetch());
+                                                      .from(MODELFAN)
+                                                      .join(MEMBERINFO)
+                                                      .on(MODELFAN.MEMBERPK.equal(MEMBERINFO.PK))
+                                                      .where(MODELFAN.MODELPK.equal(modelPK))
+                                                      .orderBy(MODELFAN.PK.desc())
+                                                      .limit((page - 1) * size, size)
+                                                      .fetch());
         ctx.close();
         return list;
     }

src/main/java/com/thmodel/service/ModelInfoService.java

@@ -152,7 +152,7 @@ public interface ModelInfoService {
      * @param likeName
      * @return
      */
-    public Map<String, Object> getQueryModel(int memberpk, String likeName, int index, int size);
+    public Map<String, Object> getQueryModel(int memberpk, String likeName, int index, int size, String area);
 
     /**
      * 查找模特的所有私密空间(最近10条)
@@ -273,7 +273,7 @@ public interface ModelInfoService {
      * @param skillPks 技能pk	SkillPK, SkillPK, SkillPK…
      * @return
      */
-    public Map<String, Object> querySkillModel(int memberpk, String skillPks, int index, int size);
+    public Map<String, Object> querySkillModel(int memberpk, String skillPks, int index, int size, String area);
 
     /**
      * 分页获取人才评论数

src/main/java/com/thmodel/service/PayService.java

@@ -124,4 +124,6 @@ public interface PayService {
     boolean reviewWithdraw(int pk, int pass);
 
     String sendGift(int memberpk, int modelpk, int activitypk, double coin, String giftname);
+
+    public void applePay(int memberpk, double amount);
 }

src/main/java/com/thmodel/service/impl/ModelInfoServiceImpl.java

@@ -225,8 +225,8 @@ public class ModelInfoServiceImpl implements ModelInfoService {
     }
 
     @Override
-    public Map<String, Object> getQueryModel(int memberpk, String likeName, int index, int size) {
-        return modelinfodao.findModelInfoByName(memberpk, likeName, index, size);
+    public Map<String, Object> getQueryModel(int memberpk, String likeName, int index, int size, String area) {
+        return modelinfodao.findModelInfoByName(memberpk, likeName, index, size, area);
     }
 
     @Override
@@ -482,7 +482,7 @@ public class ModelInfoServiceImpl implements ModelInfoService {
     }
 
     @Override
-    public Map<String, Object> querySkillModel(int memberpk, String skillPks, int index, int size) {
+    public Map<String, Object> querySkillModel(int memberpk, String skillPks, int index, int size, String area) {
         if (skillPks.length() > 0) {
             // 如果首字母是逗号，去除
             skillPks = skillPks.substring(0, 1).equals(",") ? skillPks.substring(1, skillPks.length()) : skillPks;
@@ -491,7 +491,7 @@ public class ModelInfoServiceImpl implements ModelInfoService {
                     ? skillPks.substring(0, skillPks.length() - 1)
                     : skillPks;
 
-            return modelinfodao.findDataTypeInfoByPkOrTypeName(memberpk, skillPks, Constants.data_type_5, index, size);
+            return modelinfodao.findDataTypeInfoByPkOrTypeName(memberpk, skillPks, Constants.data_type_5, area, index, size);
         } else {
             return null;
         }

src/main/java/com/thmodel/service/impl/PayServiceImpl.java

@@ -349,10 +349,10 @@ public class PayServiceImpl implements PayService {
             if (coinAll - coinOi > coin) {
                 DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
                 InsertSetMoreStep step = ctx.insertInto(GIFT_RECORD)
-                        .set(GIFT_RECORD.MEMBERPK, memberpk)
-                        .set(GIFT_RECORD.MODELPK, modelpk)
-                        .set(GIFT_RECORD.COIN, coin)
-                        .set(GIFT_RECORD.NAME, giftname);
+                                            .set(GIFT_RECORD.MEMBERPK, memberpk)
+                                            .set(GIFT_RECORD.MODELPK, modelpk)
+                                            .set(GIFT_RECORD.COIN, coin)
+                                            .set(GIFT_RECORD.NAME, giftname);
                 if (activitypk > 0) {
                     step.set(GIFT_RECORD.ACTIVITYPK, activitypk);
                 }
@@ -372,4 +372,28 @@ public class PayServiceImpl implements PayService {
         }
     }
 
+    @Override
+    public void applePay(int memberpk, double amount) {
+        boolean flag = false;
+        if (memberpk > 0) {
+            String state = PayConstants.STATE_2;
+            CashRecord cashRecord = new CashRecord();
+            cashRecord.setMemberpk(memberpk);
+            cashRecord.setFee(amount);
+            cashRecord.setAbs("");
+            cashRecord.setIntro("");
+            cashRecord.setWid("");
+            cashRecord.setPtype(PayConstants.TYPE_ALIPAY);
+            cashRecord.setPstate(PayConstants.STATE_2);
+            cashRecord.setAccflag(0);
+            int pk = cashRecordDao.insertCashRecord(cashRecord);
+
+            //将充值的金额累加的到用户账号里
+            flag = memberinfoService.addCoinI(memberpk, amount);
+            SystemPayConstants sysPay = new SystemPayConstants();
+            AccountRecord ar = new AccountRecord(memberpk, AccountConstants.accountrecord_S_TYPE_WITHDRAW, pk, AccountConstants.ACCOUNTRECORD_A_TYPE_RECHARGE, amount, "支付宝充值收入：100%");
+            sysPay.insertAccountRecord(ar);
+        }
+    }
+
 }

src/main/java/com/thmodel/servlet/ModelInfoServlet.java

@@ -338,13 +338,14 @@ public class ModelInfoServlet extends HttpServlet {
             else if (action.equalsIgnoreCase("dogetquerymodel")) {
                 int memberpk = CommentUtils.myToInt(request.getParameter("memberpk"));
                 String likeName = CommentUtils.myToString(request.getParameter("LikeName"));//名称
+                String area = request.getParameter("area");
 
                 int index = CommentUtils.myToInt(request.getParameter("index"));
                 int size = CommentUtils.myToInt(request.getParameter("size"));
                 index = index == 0 ? 1 : index;
                 size = size == 0 ? 10 : size;
 
-                Map<String, Object> map = modelInfoService.getQueryModel(memberpk, likeName, index, size);
+                Map<String, Object> map = modelInfoService.getQueryModel(memberpk, likeName, index, size, area);
 
                 List<ModelInfo> list = (List<ModelInfo>) map.get("data");
                 int count = (int) map.get("count");
@@ -567,13 +568,13 @@ public class ModelInfoServlet extends HttpServlet {
                 String skillPks = CommentUtils.myToString(request.getParameter("SkillPK"));
 
                 int memberpk = CommentUtils.myToInt(request.getParameter("memberpk"));//当前会员PK
-
+                String area = request.getParameter("area");
                 int index = CommentUtils.myToInt(request.getParameter("index"));
                 int size = CommentUtils.myToInt(request.getParameter("size"));
                 index = index == 0 ? 1 : index;
                 size = size == 0 ? 10 : size;
 
-                Map<String, Object> map = modelInfoService.querySkillModel(memberpk, skillPks, index, size);
+                Map<String, Object> map = modelInfoService.querySkillModel(memberpk, skillPks, index, size, area);
 
                 List<ModelInfo> list = (List<ModelInfo>) map.get("data");
                 int count = (int) map.get("count");

src/main/java/com/thmodel/servlet/PayServlet.java

@@ -42,8 +42,8 @@ public class PayServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;
 
-    private static PayService payService = new PayServiceImpl();
-    private static AliPay alipay = new AliPay();
+    private static PayService    payService    = new PayServiceImpl();
+    private static AliPay        alipay        = new AliPay();
     private static MemberinfoDao memberinfoDao = new MemberinfoDaoImpl();
     private static CashRecordDao cashRecordDao = new CashRecordDaoImpl();
 
@@ -297,6 +297,7 @@ public class PayServlet extends HttpServlet {
                 double amount = Double.parseDouble(CommentUtils.myToString(request.getParameter("amount")));
                 String receiptData = CommentUtils.myToString(request.getParameter("receipt-data"));
                 if (IosVerifyUtil.buyAppVerify(receiptData, 1)) {
+                    payService.applePay(memberpk, amount);
                     resultJson.put("msg", Constants.success);
                 } else {
                     resultJson.put("msg", Constants.fail);