autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 11:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-01-18 17:03:19 +08:00
parent 0b09585bbc 63051f0fcc
commit 3b9e4b5f11
4 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java
View File

@@ -38,6 +38,7 @@ import com.jsowell.pile.domain.ClearingWithdrawInfo;
import com.jsowell.pile.domain.MemberBasicInfo;
import com.jsowell.pile.dto.PayOrderDTO;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.MerchantInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -264,6 +265,19 @@ public class AdapayService {
return null;
}
// 审核失败
if (Constants.TWO.equals(adapayMemberAccount.getStatus())) {
AdapayCorpMemberVO adapayCorpMemberVO = new AdapayCorpMemberVO();
MerchantInfoVO merchantInfoVO = pileMerchantInfoService.getMerchantInfoVO(adapayMemberAccount.getMerchantId());
if (merchantInfoVO != null) {
adapayCorpMemberVO.setName(merchantInfoVO.getMerchantName());
}
adapayCorpMemberVO.setAuditState("B");
adapayCorpMemberVO.setAuditDesc(adapayMemberAccount.getRemark());
map.put("adapayCorpMember", adapayCorpMemberVO);
return map;
}
// 通过merchantId获取appId
String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId);

22
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
View File

@@ -23,6 +23,8 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
/**
@@ -69,6 +71,11 @@ public class MemberGroupServiceImpl implements MemberGroupService {
if (CollectionUtils.isEmpty(resultList)) {
return Lists.newArrayList();
}
for (MemberGroupVO memberGroupVO : resultList) {
BigDecimal discount = memberGroupVO.getDiscount();
// 返回给前端乘以10
memberGroupVO.setDiscount(discount.multiply(BigDecimal.TEN));
}
return resultList;
}
@@ -89,9 +96,24 @@ public class MemberGroupServiceImpl implements MemberGroupService {
} catch (Exception e) {
}
if (isBetween(memberGroup.getDiscount())) {
// 入库除以10
memberGroup.setDiscount(memberGroup.getDiscount().divide(BigDecimal.TEN, 2, RoundingMode.DOWN));
}
return memberGroupMapper.insertMemberGroup(memberGroup);
}
private boolean isBetween(BigDecimal price){
BigDecimal start = BigDecimal.ZERO;
BigDecimal end = BigDecimal.TEN;
return isBetween(price, start, end);
}
private boolean isBetween(BigDecimal price, BigDecimal start, BigDecimal end){
return price.compareTo(start) > 0 && price.compareTo(end) < 0;
}
// 生成编号
private String generateGroupCode() {
while (true) {

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
View File

@@ -312,13 +312,6 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
if (pileMerchantInfo == null) {
return null;
}
// MerchantInfoVO vo = MerchantInfoVO.builder()
// .merchantId(merchantId)
// .merchantName(pileMerchantInfo.getMerchantName())
// .merchantTel(pileMerchantInfo.getServicePhone())
// .organizationCode(pileMerchantInfo.getOrganizationCode())
// .deptId(pileMerchantInfo.getDeptId())
// .build();
return conversion2MerchantInfoVO(pileMerchantInfo);
}