bug

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/billing/FeeTypeEnum.java

@@ -2,7 +2,8 @@ package com.gic.enterprise.constant.billing;
 
 public enum FeeTypeEnum {
     TOTAL(1, "消费总金额"),
-    ACCOUNT_BALANCE(7, "服务市场和供销平台购买明细"),
+    ACCOUNT_BALANCE(7, "服务市场购买明细"),
+//    ACCOUNT_BALANCE(7, "服务市场和供销平台购买明细"),
     SMS_PACKAGE(4, "短信套餐包明细(余额支付)"),
     SMS(3, "国内短信消费明细"),
     INTERNATIONAL_SMS(8, "海外短信消费明细"),

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingRechargeRecordMapper.xml

@@ -230,10 +230,10 @@
         and enterprise_id = #{enterpriseId}
       </if>
       <if test="startTime != null and startTime != '' ">
-        and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
+        and create_time &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != '' ">
-        and DATE_FORMAT(deduction_time,'%Y-%m-%d') &lt;= #{endTime}
+        and create_time &lt;= #{endTime}
       </if>
       <if test="payType != null ">
         and pay_type = #{payType}

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingRechargeController.java

@@ -19,6 +19,7 @@ import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.enterprise.web.qo.BillingRechargeQO;
 import com.gic.finance.dto.TransferAccountsApprovalDTO;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,6 +80,12 @@ public class BillingRechargeController {
     @RequestMapping("/list-recharge-record")
     public RestResponse listRechargeRecord(RechargeRecordQO rechargeRecordQO) {
         rechargeRecordQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (StringUtils.isNotBlank(rechargeRecordQO.getStartTime())) {
+            rechargeRecordQO.setStartTime(rechargeRecordQO.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(rechargeRecordQO.getEndTime())) {
+            rechargeRecordQO.setEndTime(rechargeRecordQO.getEndTime() + " 23:59:59");
+        }
         ServiceResponse<Page<BillingRechargeRecordDTO>> serviceResponse = this.billingRechargeRecordApiService.listRechargeRecord(rechargeRecordQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }