Merge remote-tracking branch 'origin/master'

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/Economic/EconomicController.java

@@ -6,6 +6,7 @@ import com.gyee.runeconomy.dto.PowercurveVo;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.service.Economic.EconomicService;
+import com.gyee.runeconomy.util.DateUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("//economy")
 public class EconomicController {
-
+    String strdate = "2023-01-26";
+    Date date = DateUtils.parseDate(strdate);
     @Autowired
     private EconomicService economicService;
 
@@ -48,7 +50,7 @@ public class EconomicController {
 
     ) throws Exception {
 
-        Map<String, Object> map = economicService.getEconomyPointInfo(companyId, type, statype,datetype);
+        Map<String, Object> map = economicService.getEconomyPointInfo( date,companyId, type, statype,datetype);
         if (null != map) {
             return R.data(ResultMsg.ok(map));
         } else {

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -56,13 +56,13 @@ public class EconomicService {
      * @return
      * @throws ParseException
      */
-    public Map<String, Object> getEconomyPointInfo(String companyId, String type, String statype, String datetype) throws ParseException {
+    public Map<String, Object> getEconomyPointInfo(Date date,String companyId, String type, String statype, String datetype) throws ParseException {
 
 
         //获取当前时间
 //        String strdate = DateUtils.toDate1(new Date());
-        String strdate = "2023-01-26";
-        Date date = DateUtils.parseDate(strdate);
+//        String strdate = "2023-01-26";
+//        Date date = DateUtils.parseDate(strdate);
 
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> fdtjmap = new HashMap<>();