diff --git a/mallinkService/pom.xml b/mallinkService/pom.xml
index c08a17ef9..d78dee99c 100644
--- a/mallinkService/pom.xml
+++ b/mallinkService/pom.xml
@@ -40,11 +40,6 @@
alipay-easysdk
2.2.0
-
- com.iformall
- mallinkAdmin
- 1.0
-
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
index bc6552ef5..88a635a58 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
@@ -588,9 +588,11 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public WxCreditHistory saveOrUpdate(WxCreditHistory record,TenantEntity tenantEntity) {
- WxCreditHistory history = wxCreditHistoryMapper.selectOne(new LambdaQueryWrapper().eq(WxCreditHistory::getTicketNumber, record.getTicketNumber()));
- if (history == null){
- throw new MallinkException(ErrorCode.SMALL_TICKET_IS_USED);
+ if (StringUtils.isNotBlank(record.getTicketNumber())){
+ WxCreditHistory history = wxCreditHistoryMapper.selectOne(new LambdaQueryWrapper().eq(WxCreditHistory::getTicketNumber, record.getTicketNumber()));
+ if (history != null){
+ throw new MallinkException(ErrorCode.SMALL_TICKET_IS_USED);
+ }
}
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId());
if (wxCUserBasicInfo == null) {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
index f76992e69..0ac964938 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
@@ -342,7 +342,9 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
}else if(EnumPayWay.PAY_WAY_TT.getCode().equals(payOrder.getPayVendor())
&& EnumPayMchType.DIRECT.getCode().equals(payOrder.getMchType())
&& !sharingOrder.getMerchantId().equals(wxComposeChildOrderShare.getMerchantId())
- && EnumTtPayChannel.ALI_PAY.getCode().equals(payOrder.getTtPayWay())){
+// && EnumTtPayChannel.ALI_PAY.getCode().equals(payOrder.getTtPayWay())
+ ){
+ //todo 微信支付最大分账30% 限制
//抖音 直连 多商户 支付宝支付 进件支付宝 分账 否则记账
JSONObject jo = new JSONObject();
jo.put("type",EnumProfitPaymentReceiverType.getEnum(receiver.getReceiverType()).getMessage());