diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java index f3cd6b1f9..d3d18e374 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java +++ b/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") private String liaisonPhone; - @io.swagger.annotations.ApiModelProperty(value="抖音号",name="name") + @io.swagger.annotations.ApiModelProperty(value="抖音号",name="ttUserName") private String ttUserName; @io.swagger.annotations.ApiModelProperty(value="",name="ttCountFans") private String ttCountFans; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index c20a0a9bd..dff8938df 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -184,7 +184,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); 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()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -318,7 +318,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setCreditNum(points); 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()); if (creditHistory.getCreditNum() != null) {