diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql index 73a883eb8..59b64b39a 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql @@ -46,5 +46,7 @@ ADD COLUMN `merchant_cert_path` VARCHAR(100) COMMENT '商户自己的证书' AFT UPDATE wx_pay_account SET merchant_cert_path = CONCAT('/opt/iformall/service/merchant_wx_cert/',tenant_id,"/apiclient_cert.p12"); +ALTER TABLE wx_merchant ADD COLUMN `cash_out_last_time` datetime COMMENT '最近提交提现时间' ; + diff --git a/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx b/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx index 27acd6d4c..7011391fb 100644 Binary files a/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx and b/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx differ diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index e0a9e681b..4dd708161 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -7,12 +7,15 @@ import com.iformall.domain.po.*; import com.iformall.enums.EnumCashOutStatus; import com.iformall.enums.EnumPayWay; import com.iformall.service.*; +import com.iformall.utils.DateUtils; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -100,7 +103,13 @@ public class WxCashOutController extends BaseController { WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId()); WxMall mall = wxMallService.getByTenantId(buser.getTenantId()); Map resultMap = new HashMap(); - resultMap.put("cashOutCount", merchant.getCashOutCount()); + //当日提现次数 + Date currDateBegin = DateUtils.stringToDate(DateUtils.format(new Date())+" 00:00:00", DateUtils.DATE_TIME_PATTERN); + if (null == merchant.getCashOutLastTime() || merchant.getCashOutLastTime().before(currDateBegin)) { + resultMap.put("cashOutCount", 0); + }else { + resultMap.put("cashOutCount", merchant.getCashOutCount()); + } resultMap.put("cashOutNumber", merchant.getCashOutNumber()); resultMap.put("cashOutSupport", mall.getCashOutSupport()); resultMap.put("cashOutLimit", mall.getCashOutLimit()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 4c7d2fb93..4467451aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -268,6 +268,9 @@ public class WxMerchant extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "当日提现次数", name = "cashOutCount") private Integer cashOutCount; + + @io.swagger.annotations.ApiModelProperty(value = "最近提交提现时间", name = "cashOutLastTime") + private Date cashOutLastTime; @TableField(exist = false) @SortColumn(column = "couponSale") diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 48949a676..27c224dbb 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -37,18 +37,19 @@ + `id`,`tenant_id`,`parent_tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`, - `introduction`,`action_desc`,`is_del`,`talk_user_main`,`talk_user_aux`,link_line_phone,credit_locked,cash_out_number,cash_out_count + `introduction`,`action_desc`,`is_del`,`talk_user_main`,`talk_user_aux`,link_line_phone,credit_locked,cash_out_number,cash_out_count,cash_out_last_time m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, m.`business_id`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`, - m.`introduction`,m.`action_desc`,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,r.rental_start_date,r.rental_end_date,cash_out_number,cash_out_count + m.`introduction`,m.`action_desc`,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,r.rental_start_date,r.rental_end_date,m.cash_out_number,m.cash_out_count,m.cash_out_last_time @@ -616,7 +617,7 @@ - update wx_merchant set cash_out_number = cash_out_number-#{cashOutNumber}, cash_out_count = cash_out_count+1 where id = #{id} + update wx_merchant set cash_out_number = cash_out_number-#{cashOutNumber}, cash_out_count = cash_out_count+1,cash_out_last_time = now() where id = #{id}