修改bug

src/main/java/com/thinkgem/jeesite/modules/pay/api/OrderApiController.java

@@ -46,6 +46,8 @@ public class OrderApiController {
         }
 
         try {
+            System.out.println("开始时间：" + request.getStartDate());
+            System.out.println("结束时间：" + request.getEndDate());
             List<OrderEntity> list = orderService.getOrderList(request);
 
             res.setData(list);

src/main/java/com/thinkgem/jeesite/modules/pay/api/PayApiController.java

@@ -2,6 +2,7 @@ package com.thinkgem.jeesite.modules.pay.api;
 
 import com.thinkgem.jeesite.common.baseBean.Response;
 import com.thinkgem.jeesite.common.constant.ComCode;
+import com.thinkgem.jeesite.modules.commonError.MyException;
 import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
 import com.thinkgem.jeesite.modules.pay.juhezhong.dto.PayBackDto;
 import com.thinkgem.jeesite.modules.pay.service.PayApiService;
@@ -45,10 +46,16 @@ public class PayApiController {
             resp.setStatus(ComCode.STATUS_CODE_2000);
             resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
             resp.setData(payBackDto);
-        } catch (Exception e) {
+        } catch (MyException e){
+            resp.setStatus(ComCode.STATUS_CODE_9998);
+            resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
+            resp.setError(e.getMessage());
+
+        }catch (Exception e) {
             resp.setStatus(ComCode.STATUS_CODE_9998);
             resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
             resp.setError(e.getMessage());
+            e.printStackTrace();
         }
         return resp;
     }

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

@@ -121,10 +121,10 @@ public class BenefitSevice {
      * @return
      */
     public List<BenefitEntity> getBenefitList(OrderRequest request){
-        if(request.getStartDate()!= null){
+        if(request.getStartDate()!= null && request.getStartDate() != 0){
             request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
         }
-        if(request.getEndDate() != null){
+        if(request.getEndDate() != null && request.getEndDate() != 0){
             request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
         }
 

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

@@ -25,10 +25,10 @@ public class OrderService {
     private OrderApiDao orderApiDao;
 
     public List<OrderEntity> getOrderList(OrderRequest request){
-        if(request.getStartDate()!= null){
+        if(request.getStartDate()!= null && request.getStartDate() != 0){
             request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
         }
-        if(request.getEndDate() != null){
+        if(request.getEndDate() != null && request.getEndDate() != 0){
             request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
         }
 

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

@@ -136,7 +136,13 @@ public class PayApiService {
         rateEntity.setPayMethod("quick");
         rateEntity = userService.getRateByLevel(rateEntity);
         if(rateEntity!=null){
-            quickDto.setUserFee(new BigDecimal(Long.parseLong(request.getAmount())*100*Double.valueOf(rateEntity.getRate()))); // 手续费 单位：分 ，D0 业务必传
+            double userFee = Long.parseLong(request.getAmount())*100*Double.valueOf(rateEntity.getRate());
+            if(userFee<100){
+                userFee = 100;
+            }
+            BigDecimal bigDecimal = new BigDecimal(100+ Double.valueOf(Global.getConfig("pay.y"))*100 );
+            quickDto.setUserFee(bigDecimal); // 手续费 单位：分 ，D0 业务必传
+
         }else{
             quickDto.setUserFee(new BigDecimal(0));
         }

src/main/resources/youka.properties

@@ -107,6 +107,8 @@ image.return.url=youka-api/image/
 #ali接口获取银行logo
 logo.bank.url=https://apimg.alipay.com/combo.png?d=cashier&t=
 
+#
+pay.y = 0
 
 ## 短信相关
 message.username = 710047