修改交易时间限制，通道对接修改等

src/main/java/com/thinkgem/jeesite/common/constant/ComCode.java

@@ -170,7 +170,7 @@ public static final String QUICK_WEB_PAY = "/quick/web/pay";
     public static final String STATUS_CODE_6001 = "6001";
     public static final String STATUS_CODE_6001_DESC = "订单号不存在";
     public static final String STATUS_CODE_6002 = "6002";
-    public static final String STATUS_CODE_6002_DESC = "交易时间为09:00:00-22:00:00";
+    public static final String STATUS_CODE_6002_DESC = "交易时间为06:00:00-22:00:00";
 
 
     /**

src/main/java/com/thinkgem/jeesite/modules/messageCenter/dao/ArticleApiDao.java

@@ -12,4 +12,6 @@ public interface ArticleApiDao {
     List<ArticleEntity> getArticles(ArticleRequest request);
 
     ArticleEntity getArticleDetail(ArticleRequest request);
+
+    void addNumer(ArticleRequest request);
 }

src/main/java/com/thinkgem/jeesite/modules/messageCenter/service/ArticleApiService.java

@@ -34,8 +34,12 @@ public class ArticleApiService {
         return articles;
     }
 
+    @Transactional(readOnly = false)
     public ArticleEntity getArticleDetail(ArticleRequest request){
         ArticleEntity articleDetail = articleApiDao.getArticleDetail(request);
+        if(articleDetail != null){
+            articleApiDao.addNumer(request);
+        }
         String content = articleDetail.getContent();
         if(content.contains("/youka-manage/")){
             String replace = content.replace("/youka-manage/", "http://youkapay.com/youka-manage/");

src/main/java/com/thinkgem/jeesite/modules/pay/juhezhong/utils/DateUtil.java

@@ -51,7 +51,7 @@ public class DateUtil {
         Date time;
         try {
             time = ComCode.HHMMSS.parse(now);
-            Date start = ComCode.HHMMSS.parse("09:00:00");
+            Date start = ComCode.HHMMSS.parse("06:00:00");
             Date end = ComCode.HHMMSS.parse("22:00:00");
             if (isInTimeDuration(time, start, end)) {
                 flag = true;

src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java

@@ -1258,9 +1258,10 @@ public class PayApiService {
      */
     @Transactional(readOnly = false)
     public void updateOrderTiming() {
-        logger.debug("修改交易超过7天订单的定时任务开始");
+        logger.debug("修改交易超过1天订单的定时任务开始");
         OrderEntity orderEntity = new OrderEntity();
-        orderEntity.setEndTime(DateUtils.getDateByDay("yyyy-MM-dd HH:mm:ss", -7));
+        orderEntity.setPayStatus("0");
+        orderEntity.setEndTime(DateUtils.getDateByDay("yyyy-MM-dd HH:mm:ss", -1));
         List<OrderEntity> list = payDao.getOrderListTimeing(orderEntity);
         for (OrderEntity order : list) {
             order.setPayStatus("3");
@@ -1269,7 +1270,7 @@ public class PayApiService {
             benefitEntity.setOrderCode(order.getPayCode());
             payDao.deleteBenefit(benefitEntity);
         }
-        logger.debug("修改交易超过7天订单的定时任务开始");
+        logger.debug("修改交易超过1天订单的定时任务开始");
     }
 
     /*
@@ -1282,6 +1283,7 @@ public class PayApiService {
             OrderEntity orderEntity = new OrderEntity();
             orderEntity.setStartTime(DateUtils.getDateByDay("yyyy-MM-dd HH:mm:ss", -7));
             orderEntity.setEndTime(DateUtils.formatDate(DateUtils.addHours(new Date(), -12), "yyyy-MM-dd HH:mm:ss"));
+            orderEntity.setPayStatus("1");
             List<OrderEntity> list = payDao.getOrderListTimeing(orderEntity);
             for (OrderEntity order : list) {
 
@@ -1353,17 +1355,19 @@ public class PayApiService {
         try {
             OrderEntity orderEntity = new OrderEntity();
             orderEntity.setPayChannel("quick_no_integral");
-            //返回url有几分钟过期时间，url中订单处理需要验证码等时间，暂定查询20分钟之内的订单
-            orderEntity.setStartTime(DateUtils.formatDate(DateUtils.addMinutes(new Date(), -20), "yyyy-MM-dd HH:mm:ss"));
+            //返回url有几分钟过期时间，url中订单处理需要验证码等时间，暂定查询30分钟之内的订单
+            orderEntity.setStartTime(DateUtils.formatDate(DateUtils.addMinutes(new Date(), -30), "yyyy-MM-dd HH:mm:ss"));
             orderEntity.setEndTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            orderEntity.setPayStatus("1");
             List<OrderEntity> list = payDao.getOrderListTimeing(orderEntity);
             for (OrderEntity order : list) {
 
                 // 快捷支付
                 if ("quick".equals(order.getPayMethod()) && order.getPayStatus().equals("1")) {
                     QuickDto dto = new QuickDto();
+                    dto.setMerchantId ( ComCode.MERCHANT_ID );
+                    dto.setMerchantKey ( ComCode.MERCHANT_KEY );
                     dto.setOrderId(order.getPayCode());
-
                     dto.setTimestamp(System.currentTimeMillis());
                     JSONObject jsonObject = null;
                     if (ComCode.PAYCHANNEL_HL1.equals(order.getPayChannel())) {

src/main/java/com/thinkgem/jeesite/modules/pay/service/TimingService.java

@@ -21,7 +21,8 @@ public class TimingService {
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void updateOrders(){
         payApiService.updateOrderTiming();
-        payApiService.updateOrders();
+        //通道关闭
+//        payApiService.updateOrders();
     }
 
     @Scheduled(cron = "20 0/2 * * * ? ")

src/main/java/com/thinkgem/jeesite/modules/user/api/UserApiController.java

@@ -9,10 +9,7 @@ import com.thinkgem.jeesite.modules.pay.entity.RateEntity;
 import com.thinkgem.jeesite.modules.user.bean.IdentityCodeRequest;
 import com.thinkgem.jeesite.modules.user.bean.JuHeZhongPayRequest;
 import com.thinkgem.jeesite.modules.user.bean.UserRequest;
-import com.thinkgem.jeesite.modules.user.entity.CardEntity;
-import com.thinkgem.jeesite.modules.user.entity.IdentityCodeEntity;
-import com.thinkgem.jeesite.modules.user.entity.Level;
-import com.thinkgem.jeesite.modules.user.entity.UserEntity;
+import com.thinkgem.jeesite.modules.user.entity.*;
 import com.thinkgem.jeesite.modules.user.service.UserApiService;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
@@ -229,7 +226,8 @@ public class UserApiController {
                     resp.setMessage(ComCode.STATUS_CODE_4002_DESC);
                     return resp;
                 }
-            } else if (!StringUtils.isBlank(request.getMobile()) && !StringUtils.isBlank(request.getFunction()) && !StringUtils.isBlank(request.getIdentityCode())) {
+            }
+            else if (!StringUtils.isBlank(request.getMobile()) && !StringUtils.isBlank(request.getFunction()) && !StringUtils.isBlank(request.getIdentityCode())) {
                 // 根据手机号 + 使用场景 + 验证码查询
                 IdentityCodeEntity identityCodeEntity = userService.getIdentifyCode(request);
                 // 验证码使用场景
@@ -679,10 +677,12 @@ public class UserApiController {
         try{
             List<UserEntity> myInviting = userService.getMyInviting(request);
             Integer activeNum = userService.getActiveNum(request);
+            LevelDetail level = userService.getLevelDetailByLevel(request);
             HashMap<String, Object> map = Maps.newHashMap();
             map.put("allNum",myInviting.size());
             map.put("activeNum",activeNum);
             map.put("list",myInviting);
+            map.put("condition",level.getRemarks());
             resp.setData(map);
             resp.setStatus(ComCode.STATUS_CODE_2000);
             resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
@@ -744,4 +744,28 @@ public class UserApiController {
         }
         return resp;
     }
+
+
+
+
+    @PostMapping("/getLevelDetail")
+    public Response getLevelDetail(UserRequest request){
+        Response resp = new Response();
+        if(request == null || StringUtils.isBlank(request.getSubMerchantCode())){
+            resp.setStatus(ComCode.STATUS_CODE_4002);
+            resp.setMessage(ComCode.STATUS_CODE_4001_DESC);
+            return resp;
+        }
+        try{
+            List<LevelDetail> detail = userService.getLevelDetail();
+            resp.setData(detail);
+            resp.setStatus(ComCode.STATUS_CODE_2000);
+            resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
+        }catch (Exception e){
+            resp.setStatus(ComCode.STATUS_CODE_9998);
+            resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
+            resp.setError(e.getMessage());
+        }
+        return resp;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/user/dao/UserApiDao.java

@@ -129,4 +129,9 @@ public interface UserApiDao {
 
     //获取用户升级之前信息
     UserEntity getUpgradeUserInfo(String mobile);
+
+    //获取等级升级条件
+    List<LevelDetail> getLevelDetail();
+
+    LevelDetail getLevelDetailByLevel(UserRequest request);
 }

src/main/java/com/thinkgem/jeesite/modules/user/entity/LevelDetail.java

+package com.thinkgem.jeesite.modules.user.entity;
+
+import com.thinkgem.jeesite.modules.pay.entity.RateEntity;
+
+import java.util.List;
+
+
+public class LevelDetail {
+
+    private String level; // 等级
+    private String name;// 等级名称
+    private String remarks; // 升级说明
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java

@@ -184,7 +184,7 @@ public class UserApiService {
         if (userDetailEntity != null) {
             userEntity.setUserDetail(userDetailEntity);
             CardEntity cardEntity = userDao.getCardInfoByCode(userEntity);
-            userEntity.getUserDetail().setCard(cardEntity);
+            userEntity.getUserDetail().setCard(cardEntity==null?new CardEntity():cardEntity);
         } else {
             userDetailEntity = new UserDetailEntity();
             userEntity.setUserDetail(userDetailEntity);
@@ -955,4 +955,12 @@ public class UserApiService {
         return sb.toString();
     }
 
+    public List<LevelDetail> getLevelDetail(){
+        List<LevelDetail> levels = userDao.getLevelDetail();
+        return levels;
+    }
+
+    public LevelDetail getLevelDetailByLevel(UserRequest request) {
+        return userDao.getLevelDetailByLevel(request);
+    }
 }

src/main/resources/mappings/modules/messageCenter/ArticleApiDao.xml

@@ -78,4 +78,8 @@
             a.create_date DESC,
             a.weight DESC
     </select>
+
+    <update id="addNumer">
+        UPDATE cms_article SET hits = hits + 1 WHERE id = #{articleId}
+    </update>
 </mapper>
\ No newline at end of file

src/main/resources/mappings/modules/pay/PayApiDao.xml

@@ -106,6 +106,7 @@
             pay_no,
             pay_code,
             pay_channel,
+            pay_method,
             pay_status,
             amount,
             subject,
@@ -113,7 +114,11 @@
             pay_type,
             card_code
         FROM youka_orders
-        WHERE pay_status = 1
+        WHERE
+        1=1
+        <if test="payStatus != null and payStatus != ''">
+            AND pay_status = #{payStatus}
+        </if>
         <if test="payChannel != null and payChannel != ''">
             AND pay_channel = #{payChannel}
         </if>

src/main/resources/mappings/modules/user/UserDao.xml

@@ -406,7 +406,7 @@
             yau.update_by AS modifiedUser
         FROM
             youka_about_us yau
-        ORDER BYd
+        ORDER BY
             yau.update_date DESC
         LIMIT 1
     </select>
@@ -1064,4 +1064,26 @@
         yuu.after_mobile = #{mobile}
         LIMIT 1
     </select>
+
+    <select id="getLevelDetail" resultType="com.thinkgem.jeesite.modules.user.entity.LevelDetail">
+        SELECT
+        `level`,
+        `name`,
+        `remarks`
+        FROM
+        youka_levels yl
+        WHERE sort = 0
+        ORDER BY create_date DESC
+    </select>
+    <select id="getLevelDetailByLevel" resultType="com.thinkgem.jeesite.modules.user.entity.LevelDetail">
+          SELECT
+            y1.`level`,
+            y1.`name`,
+            y1.remarks
+        FROM
+            youka_levels y1
+        WHERE
+            y1.sort = 0
+        AND y1.`level` = "D"
+    </select>
 </mapper>
\ No newline at end of file

src/main/webapp/static/share/spread.html

@@ -47,7 +47,7 @@
 <div align="center" class="containter">
     <button onclick="window.open('https://www.pgyer.com/7aJ3')" id="ios">IOS 下载</button>
     <br>
-    <button onclick="window.open('https://www.pgyer.com/7aJ3')" id="android">安卓下载</button>
+    <button onclick="window.open('https://fir.im/2mdz?utm_source=fir&utm_medium=qr&release_id=5b3ae2beca87a802251eeb4c')" id="android">安卓下载</button>
 </div>
 </body>
 </html>
\ No newline at end of file