Преглед изворни кода

Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207

release_toaliyun_real
zhengfangyuan пре 3 година
родитељ
комит
786e51650c
4 измењених фајлова са 14 додато и 2 уклоњено
  1. +5
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022072800001__pay_account.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml

+ 5
- 0
mallinkAdmin/src/main/resources/db/migration/V2022072800001__pay_account.sql Прегледај датотеку

@@ -203,3 +203,8 @@ ALTER TABLE `mallink`.`wx_pay_order_98`
ADD COLUMN `mch_type` smallint(2) DEFAULT 0 COMMENT '0:总分,1:直连' AFTER `pay_param`; ADD COLUMN `mch_type` smallint(2) DEFAULT 0 COMMENT '0:总分,1:直连' AFTER `pay_param`;
ALTER TABLE `mallink`.`wx_pay_order_99` ALTER TABLE `mallink`.`wx_pay_order_99`
ADD COLUMN `mch_type` smallint(2) DEFAULT 0 COMMENT '0:总分,1:直连' AFTER `pay_param`; ADD COLUMN `mch_type` smallint(2) DEFAULT 0 COMMENT '0:总分,1:直连' AFTER `pay_param`;



ALTER TABLE `mallink`.`wx_merchant_b_user`
ADD COLUMN `other_merchant` json COMMENT '可核销其他商户' AFTER `is_admin`;

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java Прегледај датотеку

@@ -47,6 +47,9 @@ public class WxMerchantBUser extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "是否是管理员", name = "isAdmin") @io.swagger.annotations.ApiModelProperty(value = "是否是管理员", name = "isAdmin")
private Integer isAdmin; private Integer isAdmin;


@io.swagger.annotations.ApiModelProperty(value = "可核销其他商户", name = "otherMerchant")
private String otherMerchant;

@TableField(exist = false) @TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "b用户ID", name = "buserId") @io.swagger.annotations.ApiModelProperty(value = "b用户ID", name = "buserId")
private transient Long buserId; private transient Long buserId;


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java Прегледај датотеку

@@ -105,7 +105,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{
String before3dayStr = DateUtils.getTimeBefore(2, new Date()); String before3dayStr = DateUtils.getTimeBefore(2, new Date());
Date before3day = DateUtils.stringToDate(before3dayStr); Date before3day = DateUtils.stringToDate(before3dayStr);
if(before3day.before(record.getCreateTime())){ if(before3day.before(record.getCreateTime())){
return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_READY.getCode(),"未满足结算周期..", null,null);
return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode(),"未满足结算周期..", null,null);
} }
try { try {
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount);
@@ -297,6 +297,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{
updSharingOrder.setId(sharingOrder.getId()); updSharingOrder.setId(sharingOrder.getId());
updSharingOrder.updateTenantInfo(payOrder); updSharingOrder.updateTenantInfo(payOrder);
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode());
updSharingOrder.setErrorMsg("待分账重试");
updSharingOrder.setUpdateTime(new Date()); updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder); wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(); return new ResultData();
@@ -342,6 +343,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{
updSharingOrder.setId(sharingOrder.getId()); updSharingOrder.setId(sharingOrder.getId());
updSharingOrder.updateTenantInfo(payOrder); updSharingOrder.updateTenantInfo(payOrder);
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode());
updSharingOrder.setErrorMsg("待分账重试");
updSharingOrder.setReceivers(receivers.toJSONString()); updSharingOrder.setReceivers(receivers.toJSONString());
updSharingOrder.setUpdateTime(new Date()); updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder); wxProfitSharingOrderMapper.updateById(updSharingOrder);


+ 3
- 1
mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml Прегледај датотеку

@@ -17,10 +17,12 @@
<result column="status" jdbcType="INTEGER" property="status"/> <result column="status" jdbcType="INTEGER" property="status"/>


<result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> <result column="is_admin" jdbcType="INTEGER" property="isAdmin"/>
<result column="other_merchant" jdbcType="VARCHAR" property="otherMerchant"/>

</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`phone`,`user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status`,`is_admin`
`id`,`tenant_id`,`parent_tenant_id`,`phone`,`user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status`,`is_admin`,`other_merchant`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Loading…
Откажи
Сачувај