修改时间格式

src/main/java/com/thinkgem/jeesite/common/utils/MD5.java

 package com.thinkgem.jeesite.common.utils;
 
+import com.thinkgem.jeesite.common.constant.ComCode;
 import org.apache.commons.codec.digest.DigestUtils;
 
 /**
@@ -58,4 +59,7 @@ public class MD5 {
     }
 
 
+    public static void main(String[] args){
+        System.out.println(MD5.sign("youka", ComCode.signCode, "utf-8"));
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/pay/bean/OrderRequest.java

 package com.thinkgem.jeesite.modules.pay.bean;
 
 import com.thinkgem.jeesite.common.baseBean.Request;
+import com.thinkgem.jeesite.common.utils.StringUtils;
 
 import java.util.Date;
 
@@ -18,9 +19,9 @@ public class OrderRequest extends Request {
 
     private String endTime;
 
-    private Date startDate;
+    private Long startDate;
 
-    private Date endDate;
+    private Long endDate;
 
     public String getPayChannel() {
         return payChannel;
@@ -54,19 +55,19 @@ public class OrderRequest extends Request {
         this.endTime = endTime;
     }
 
-    public Date getStartDate() {
+    public Long getStartDate() {
         return startDate;
     }
 
-    public void setStartDate(Date startDate) {
+    public void setStartDate(Long startDate) {
         this.startDate = startDate;
     }
 
-    public Date getEndDate() {
+    public Long getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Date endDate) {
+    public void setEndDate(Long endDate) {
         this.endDate = endDate;
     }
 }

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

@@ -80,7 +80,7 @@ public class BenefitSevice {
         }
 
         // 昨日收益
-        entity.setEndTime(DateUtils.getYesterday(todayYMD,"yyyy-MM-dd") + "23:59:59");
+        entity.setEndTime(DateUtils.getYesterday(todayYMD,"yyyy-MM-dd") + " 23:59:59");
         entity.setStartTime(DateUtils.getYesterday(todayYMD,"yyyy-MM-dd") + " 00:00:00");
 
         BenefitEntity benefitEntityYesterday = payDao.getBenefitSum(entity);
@@ -93,7 +93,7 @@ public class BenefitSevice {
 
         // 本月收益
         entity.setEndTime(today);
-        entity.setStartTime(DateUtils.getFirstByMonth(todayYMD,"yyyy-MM-dd") + "00:00:00");
+        entity.setStartTime(DateUtils.getFirstByMonth(todayYMD,"yyyy-MM-dd") + " 00:00:00");
         BenefitEntity benefitEntityMonth = payDao.getBenefitSum(entity);
         if(benefitEntityMonth != null && StringUtils.isNotBlank(benefitEntityMonth.getAmount())){
             balanceEntity.setMonthIncome(benefitEntityMonth.getAmount());
@@ -103,7 +103,7 @@ public class BenefitSevice {
 
         // 本年收益
         entity.setEndTime(today);
-        entity.setStartTime(DateUtils.getCurrYearFirst(todayYMD,"yyyy-MM-dd") + "00:00:00");
+        entity.setStartTime(DateUtils.getCurrYearFirst(todayYMD,"yyyy-MM-dd") + " 00:00:00");
         BenefitEntity benefitEntityYear = payDao.getBenefitSum(entity);
         if(benefitEntityYear != null && StringUtils.isNotBlank(benefitEntityYear.getAmount())){
             balanceEntity.setYearIncome(benefitEntityYear.getAmount());
@@ -122,10 +122,10 @@ public class BenefitSevice {
      */
     public List<BenefitEntity> getBenefitList(OrderRequest request){
         if(request.getStartDate()!= null){
-            request.setStartTime(DateUtils.formatDate(request.getStartDate(),"yyyy-MM-dd") + " 00:00:00");
+            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
         }
         if(request.getEndDate() != null){
-            request.setEndTime(DateUtils.formatDate(request.getEndDate(),"yyyy-MM-dd") + " 23:59:59");
+            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
         }
 
         return orderApiDao.getBenefitList(request);

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,10 +26,10 @@ public class OrderService {
 
     public List<OrderEntity> getOrderList(OrderRequest request){
         if(request.getStartDate()!= null){
-            request.setStartTime(DateUtils.formatDate(request.getStartDate(),"yyyy-MM-dd") + " 00:00:00");
+            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
         }
         if(request.getEndDate() != null){
-            request.setEndTime(DateUtils.formatDate(request.getEndDate(),"yyyy-MM-dd") + " 23:59:59");
+            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
         }
 
         return orderApiDao.getOrderList(request);

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

@@ -577,5 +577,31 @@ public class UserApiController {
         return resp;
     }
 
+//    /**
+//     * 修改用户等级
+//     *
+//     * @param request
+//     * @return
+//     */
+//    @PostMapping("/modifyUserLevel")
+//    public Response modifyUserLevel(UserRequest request){
+//        Response resp = new Response();
+//        if(request == null || StringUtils.isBlank(request.getSubMerchantCode())){
+//            resp.setStatus(ComCode.STATUS_CODE_4001);
+//            resp.setMessage(ComCode.STATUS_CODE_4001_DESC);
+//            return resp;
+//        }
+//        try {
+//            userService.updateUser(request);
+//            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/resources/youka.properties

@@ -94,7 +94,7 @@ activiti.form.server.url=
 #路径前缀
 #sys.pre.url=http://localhost:8080/
 #sys.pre.url=http://youka-api-zhennan-test.router.default.svc.cluster.local/
-sys.pre.url=http://39.107.124.166:8080/youka-api
+sys.pre.url=http://39.107.124.166:8080/
 #图片文件保存地址
 #image.save.url=D:/youka/images/
 #image.save.url=/tomcat/webapps/ROOT/youka/image/