提现日期设置

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/MerchantApiController.java

@@ -26,6 +26,8 @@ import com.jpsoft.bus.modules.merchant.entity.WithdrawalRecord;
 import com.jpsoft.bus.modules.merchant.service.AccountInfoService;
 import com.jpsoft.bus.modules.merchant.service.CapitalInfoService;
 import com.jpsoft.bus.modules.merchant.service.WithdrawalRecordService;
+import com.jpsoft.bus.modules.sys.entity.DataDictionary;
+import com.jpsoft.bus.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -60,6 +62,9 @@ public class MerchantApiController {
     @Autowired
     private CompanyInfoService companyInfoService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @Autowired
     private DriverInfoService driverInfoService;
 
@@ -719,12 +724,15 @@ public class MerchantApiController {
 
         //    }
 
+
+            DataDictionary dataDictionary = dataDictionaryService.findByName("提现日期");
             Map<String,Object> map = new HashMap<>();
             map.put("withdrawalAmount",withdrawalAmount);
             map.put("todayRevenue",todayRevenue);
             map.put("onlineTotalRevenue",onlineTotalRevenue.add(todayRevenue));
             map.put("alreadyWithdrawalAmount",alreadyWithdrawalAmount);
             map.put("account",accountInfo);
+            map.put("date",dataDictionary.getValue());
 
 
             messageResult.setData(map);