diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java index fdc9655a2..2412014b7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java @@ -13,4 +13,6 @@ public interface CouponValidateService { //使用后核销券 boolean useCoupon(String couponLogId); + + JSONObject getPaymentManager(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java index 0c771bc18..1e1e5d3e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java @@ -1,6 +1,7 @@ package au.com.royalpay.payment.manage.customers.core.impls; import au.com.royalpay.payment.manage.customers.core.CouponValidateService; +import au.com.royalpay.payment.manage.mappers.customers.CustomerMembershipMapper; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import cn.yixblog.platform.http.HttpRequestGenerator; import cn.yixblog.platform.http.HttpRequestResult; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.util.UriComponentsBuilder; +import javax.annotation.Resource; import java.util.Date; @@ -34,6 +36,9 @@ public class CouponValidateServiceImpl implements CouponValidateService { @Value("${customer.app.auth-code}") private String CUSTOMER_AUTH_CODE; + @Resource + private CustomerMembershipMapper customerMembershipMapper; + @Override public JSONObject getCoupon(JSONObject partner,int page,int limit) { String timestamp = System.currentTimeMillis() + ""; @@ -133,4 +138,11 @@ public class CouponValidateServiceImpl implements CouponValidateService { } return false; } + + @Override + public JSONObject getPaymentManager() { + JSONObject object = new JSONObject(); + object.put("managers",customerMembershipMapper.listPaymentManagerByCus()); + return object; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/web/PaymentManagerController.java b/src/main/java/au/com/royalpay/payment/manage/customers/web/PaymentManagerController.java new file mode 100644 index 000000000..ed35b736e --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/customers/web/PaymentManagerController.java @@ -0,0 +1,28 @@ +package au.com.royalpay.payment.manage.customers.web; + +import au.com.royalpay.payment.manage.apps.AppController; +import au.com.royalpay.payment.manage.customers.core.CouponValidateService; +import com.alibaba.fastjson.JSONObject; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +/** + * Created by yuan on 2017/12/27. + */ +@RequestMapping(value = "/manager") +@AppController +public class PaymentManagerController { + + @Resource + private CouponValidateService couponVerificationService; + + @GetMapping(value = "/get_payment_manage") + public JSONObject getPaymentManager(){ + JSONObject json = couponVerificationService.getPaymentManager(); + return json; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java index 916874d6a..d9324c5db 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java @@ -35,4 +35,6 @@ public interface CustomerMembershipMapper { List listEncourageBalanceHistory(@Param("fromDate") Date fromDate, @Param("toDate") Date toDate, @Param("memberId") String memberId); BigDecimal sumEncourageBalance(); + + List listPaymentManagerByCus(); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml index 6de252776..28127795d 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml @@ -49,4 +49,11 @@ + + \ No newline at end of file