Commit 40342e31 authored by huangjiamin's avatar huangjiamin

充值赠送

parent 86ea1623
...@@ -3,9 +3,7 @@ package com.edgec.browserbackend.account.controller; ...@@ -3,9 +3,7 @@ package com.edgec.browserbackend.account.controller;
import com.edgec.browserbackend.account.service.PayBackService; import com.edgec.browserbackend.account.service.PayBackService;
import com.edgec.browserbackend.browser.domain.PayBack; import com.edgec.browserbackend.browser.domain.PayBack;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
...@@ -26,4 +24,10 @@ public class PayBackController { ...@@ -26,4 +24,10 @@ public class PayBackController {
public List<PayBack> getAll() { public List<PayBack> getAll() {
return payBackService.findAll(); return payBackService.findAll();
} }
@PutMapping
public List<PayBack> putBack(@RequestBody PayBack payBack) {
return payBackService.updatePayBack(payBack);
}
} }
...@@ -12,4 +12,6 @@ import java.util.List; ...@@ -12,4 +12,6 @@ import java.util.List;
public interface PayBackService { public interface PayBackService {
List<PayBack> findAll(); List<PayBack> findAll();
List<PayBack> updatePayBack(PayBack payBack);
} }
...@@ -5,6 +5,7 @@ import com.edgec.browserbackend.browser.domain.PayBack; ...@@ -5,6 +5,7 @@ import com.edgec.browserbackend.browser.domain.PayBack;
import com.edgec.browserbackend.browser.repository.PayBackRepository; import com.edgec.browserbackend.browser.repository.PayBackRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List; import java.util.List;
...@@ -23,4 +24,14 @@ public class PayBackServiceImpl implements PayBackService { ...@@ -23,4 +24,14 @@ public class PayBackServiceImpl implements PayBackService {
public List<PayBack> findAll() { public List<PayBack> findAll() {
return payBackRepository.findAll(); return payBackRepository.findAll();
} }
@Override
public List<PayBack> updatePayBack(PayBack payBack) {
List<PayBack> list = payBackRepository.findByPay(payBack.getPay());
if(list.size() > 0 && payBack.getPay() > 0){
list.forEach(payBackRepository::delete);
payBackRepository.insert(payBack);
}
return payBackRepository.findAll();
}
} }
...@@ -590,7 +590,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -590,7 +590,7 @@ public class PaymentServiceImpl implements PaymentService {
balance.setUsername(byTradeNo.getUsername()); balance.setUsername(byTradeNo.getUsername());
} }
// 充值返现 // 充值返现
PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount()); PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount()).get(0);
if (payBack == null) { if (payBack == null) {
payBack = new PayBack(); payBack = new PayBack();
} }
...@@ -658,7 +658,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -658,7 +658,7 @@ public class PaymentServiceImpl implements PaymentService {
balance.setUsername(byTradeNo.getUsername()); balance.setUsername(byTradeNo.getUsername());
} }
// 充值返现 // 充值返现
PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount()); PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount()).get(0);
if (payBack == null) if (payBack == null)
payBack = new PayBack(); payBack = new PayBack();
balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount() + payBack.getBack()); balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount() + payBack.getBack());
...@@ -802,7 +802,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -802,7 +802,7 @@ public class PaymentServiceImpl implements PaymentService {
if (b) { if (b) {
log.info("订单 " + byTradeNo.getTradeNo() + " 的支付状态更新为成功"); log.info("订单 " + byTradeNo.getTradeNo() + " 的支付状态更新为成功");
// 2.2 获取充值优惠赠送 // 2.2 获取充值优惠赠送
PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount()); PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount()).get(0);
if (payBack == null) { if (payBack == null) {
payBack = new PayBack(); payBack = new PayBack();
} }
......
package com.edgec.browserbackend.browser.domain; package com.edgec.browserbackend.browser.domain;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
@Document(collection = "paybackprice") @Document(collection = "paybackprice")
public class PayBack { public class PayBack {
@Id
private String id;
private int pay; private int pay;
private int back = 0; private int back = 0;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public int getBack() { public int getBack() {
return back; return back;
} }
......
...@@ -3,6 +3,9 @@ package com.edgec.browserbackend.browser.repository; ...@@ -3,6 +3,9 @@ package com.edgec.browserbackend.browser.repository;
import com.edgec.browserbackend.browser.domain.PayBack; import com.edgec.browserbackend.browser.domain.PayBack;
import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.MongoRepository;
import java.util.List;
public interface PayBackRepository extends MongoRepository<PayBack, String> { public interface PayBackRepository extends MongoRepository<PayBack, String> {
PayBack findByPay(int pay);
List<PayBack> findByPay(int pay);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment