ソースを参照

ceshi

release_toaliyun_real
xhxu 5年前
コミット
24aab3ca5e
2個のファイルの変更3行の追加3行の削除
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java ファイルの表示

@@ -26,7 +26,7 @@ public class TtUpSettlein extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="联系电话",name="liaisonPhone") @io.swagger.annotations.ApiModelProperty(value="联系电话",name="liaisonPhone")
private String liaisonPhone; private String liaisonPhone;


@io.swagger.annotations.ApiModelProperty(value="抖音号",name="name")
@io.swagger.annotations.ApiModelProperty(value="抖音号",name="ttUserName")
private String ttUserName; private String ttUserName;
@io.swagger.annotations.ApiModelProperty(value="",name="ttCountFans") @io.swagger.annotations.ApiModelProperty(value="",name="ttCountFans")
private String ttCountFans; private String ttCountFans;


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java ファイルの表示

@@ -184,7 +184,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService
creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setMerchantId(record.getMerchantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setSpend(record.getPayAmount()); creditHistory.setSpend(record.getPayAmount());
creditHistory.setChangePurpose(record.getSourceAppName()+"·消费:商户["+record.getShopName()+"] ("+record.getPayAmountStr()+"元) ");
creditHistory.setChangePurpose(record.getSourceAppName()+"·消费:商户["+record.getMerchantName()+"] ("+record.getPayAmountStr()+"元) ");
creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId());
Integer creditNum = 0; Integer creditNum = 0;
if (creditHistory.getCreditNum() != null) { if (creditHistory.getCreditNum() != null) {
@@ -318,7 +318,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService


creditHistory.setCreditNum(points); creditHistory.setCreditNum(points);
creditHistory.setSpend(0-record.getRefundAmount()); creditHistory.setSpend(0-record.getRefundAmount());
creditHistory.setChangePurpose(record.getSourceAppName()+"·消费退款:商户["+record.getShopName()+"] ("+record.getRefundAmountStr()+"元) ");
creditHistory.setChangePurpose(record.getSourceAppName()+"·消费退款:商户["+record.getMerchantName()+"] ("+record.getRefundAmountStr()+"元) ");
creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId());


if (creditHistory.getCreditNum() != null) { if (creditHistory.getCreditNum() != null) {


読み込み中…
キャンセル
保存