Przeglądaj źródła

fix cashout

release_toaliyun_real
xiaohanzi 5 lat temu
rodzic
commit
c3960cd3e5
5 zmienionych plików z 19 dodań i 4 usunięć
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql
  2. BIN
      mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx
  3. +10
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  5. +4
    -3
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql Wyświetl plik

@@ -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 '最近提交提现时间' ;




BIN
mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx Wyświetl plik


+ 10
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Wyświetl plik

@@ -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<String,Object> resultMap = new HashMap<String,Object>();
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());


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Wyświetl plik

@@ -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")


+ 4
- 3
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Wyświetl plik

@@ -37,18 +37,19 @@
<result column="credit_locked" property="creditLocked"/>
<result column="cash_out_number" jdbcType="INTEGER" property="cashOutNumber"/>
<result column="cash_out_count" jdbcType="INTEGER" property="cashOutCount"/>
<result column="cash_out_last_time" jdbcType="TIMESTAMP" property="cashOutLastTime"/>
</resultMap>
<sql id="allColumns">
`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
</sql>
<sql id="allColumnsVo">
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
</sql>
<sql id="dynamicWhereConditions">
@@ -616,7 +617,7 @@
</update>
<update id="reduceCash" parameterType="com.iformall.domain.po.WxMerchant">
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}
</update>
<update id="increaseCashCount" parameterType="com.iformall.domain.po.WxMerchant">


Ładowanie…
Anuluj
Zapisz