Просмотр исходного кода

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

release_toaliyun_real
lin 2 лет назад
Родитель
Сommit
fce5af0796
3 измененных файлов: 8 добавлений и 9 удалений
  1. +0
    -5
      mallinkService/pom.xml
  2. +5
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java

+ 0
- 5
mallinkService/pom.xml Просмотреть файл

@@ -40,11 +40,6 @@
<artifactId>alipay-easysdk</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>com.iformall</groupId>
<artifactId>mallinkAdmin</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

</project>

+ 5
- 3
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<WxCreditHistory>().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<WxCreditHistory>().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) {


+ 3
- 1
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());


Загрузка…
Отмена
Сохранить