Merge remote-tracking branch 'origin/master'

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateServiceImpl.java

@@ -7,12 +7,16 @@ import com.baiye.modules.system.service.PayTemplateService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.Cache;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.Set;
+
 /**
  * @author yqy
  * @date
@@ -23,6 +27,10 @@ import java.text.DecimalFormat;
 public class PayTemplateServiceImpl implements PayTemplateService {
 
     private final PayTemplateRepository payTemplateRepository;
+    @Value("$payTemplate.base_fee")
+    private Double baseFee;
+    @Value("$payTemplate.beyond_fee")
+    private Double beyondFee;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -48,7 +56,16 @@ public class PayTemplateServiceImpl implements PayTemplateService {
 
     @Override
     public Object query() {
-        return payTemplateRepository.findByStatus(DefaultNumberConstants.ZERO_NUMBER);
+        HashMap<Object, Object> map = new HashMap<>();
+        Set<PayTemplate> payTemplates = payTemplateRepository.findByStatus(DefaultNumberConstants.ZERO_NUMBER);
+        for (PayTemplate payTemplate : payTemplates) {
+            Double amount = payTemplate.getAmount();
+            payTemplate.setAmount(amount + baseFee);
+        }
+        map.put("list",payTemplates);
+        map.put("baseFee",baseFee);
+        map.put("beyondFee",beyondFee);
+        return map;
     }
 
     @Override

manage/ad-platform-management/src/main/resources/config/application.yml

@@ -77,4 +77,8 @@ snowflake:
   workerId: 9
   datacenterId: 9
 
+payTemplate:
+  base_fee: 30.00
+  beyond_fee: 0.15
+