diff --git a/.idea/goldcoin.iml b/.idea/goldcoin.iml index b107a2d..ee9a001 100644 --- a/.idea/goldcoin.iml +++ b/.idea/goldcoin.iml @@ -1,11 +1,8 @@ - - - + + - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8c82be2..b360b67 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,18 @@ 3.0.5 test + + org.junit.jupiter + junit-jupiter-api + 5.8.1 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.8.1 + test + diff --git a/src/main/java/com/example/gb/controller/GoldPayGOrderController.java b/src/main/java/com/example/gb/controller/GoldPayGOrderController.java new file mode 100644 index 0000000..b21f069 --- /dev/null +++ b/src/main/java/com/example/gb/controller/GoldPayGOrderController.java @@ -0,0 +1,102 @@ +package com.example.gb.controller; + +import com.example.gb.bean.PayGOrder; +import com.example.gb.service.GoldPayGOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@CrossOrigin +@RequestMapping("/goldPayGOrder") +public class GoldPayGOrderController { + + @Autowired + private GoldPayGOrderService goldPayGOrderService; + + /** + * 获取所有订单 + */ + @GetMapping("/") + public List getAllOrders() { + return goldPayGOrderService.getAllOrders(); + } + + /** + * 根据ID获取订单 + */ + @GetMapping("/{id}") + public PayGOrder getOrderById(@PathVariable Integer id) { + return goldPayGOrderService.getOrderById(id); + } + + /** + * 根据精网号获取订单 + */ + @GetMapping("/jwCode/{jwCode}") + public List getOrderByJwCode(@PathVariable Integer jwCode) { + return goldPayGOrderService.getOrderByJwCode(jwCode); + } + + /** + * 根据订单号获取订单 + */ + @GetMapping("/orderNo/{orderNo}") + public PayGOrder getOrderByOrderNo(@PathVariable String orderNo) { + return goldPayGOrderService.getOrderByOrderNo(orderNo); + } + + /** + * 根据支付类型获取订单 + */ + @GetMapping("payStyle/{payStyle}") + public PayGOrder getOrderByPayStyle(@PathVariable Boolean payStyle) { + return goldPayGOrderService.getOrderByPayStyle(payStyle); + } + + /** + * 根据成功时间范围获取订单 + */ + @GetMapping("/successTime") + public List getOrdersBySuccessTimeRange( + @RequestParam("startTime") Integer startTime, + @RequestParam("endTime") Integer endTime) { + return goldPayGOrderService.getOrdersBySuccessTimeRange(startTime, endTime); + } + + /** + * 分页查询订单 + */ + @GetMapping("/page") + public List getOrdersByPage( + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size) { + int offset = page * size; + return goldPayGOrderService.getOrdersByPage(offset, size); + } + + /** + * 创建新订单 + */ + @PostMapping("/") + public boolean createOrder(@RequestBody PayGOrder order) { + return goldPayGOrderService.createOrder(order); + } + + /** + * 更新订单信息 + */ + @PutMapping("/") + public boolean updateOrder(@RequestBody PayGOrder order) { + return goldPayGOrderService.updateOrder(order); + } + + /** + * 删除订单 + */ + @DeleteMapping("/{id}") + public boolean deleteOrder(@PathVariable Integer id) { + return goldPayGOrderService.deleteOrder(id); + } +} diff --git a/src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java b/src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java new file mode 100644 index 0000000..f934215 --- /dev/null +++ b/src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java @@ -0,0 +1,30 @@ +package com.example.gb.dao; + +import com.example.gb.bean.PayGOrder; +import org.apache.ibatis.annotations.*; + +import java.util.List; + +@Mapper +public interface GoldPayGOrderMapper { + + List findAll(); + + PayGOrder findById(Integer id); + + PayGOrder findByOrderNo(String orderNo); + + List findByJwCode(Integer jwCode); + + PayGOrder findByPayStyle(Boolean payStyle); + + List findBySuccessTimeRange(@Param("startTime") Integer startTime, @Param("endTime") Integer endTime); + + List findByPage(@Param("offset") int offset, @Param("limit") int limit); + + int insert(PayGOrder order); + + int update(PayGOrder order); + + int deleteById(Integer id); +} diff --git a/src/main/java/com/example/gb/service/GoldPayGOrderService.java b/src/main/java/com/example/gb/service/GoldPayGOrderService.java new file mode 100644 index 0000000..d6e8825 --- /dev/null +++ b/src/main/java/com/example/gb/service/GoldPayGOrderService.java @@ -0,0 +1,19 @@ +package com.example.gb.service; + +import com.example.gb.bean.PayGOrder; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface GoldPayGOrderService { + List getAllOrders(); + PayGOrder getOrderById(Integer id); + PayGOrder getOrderByOrderNo(String orderNo); + List getOrderByJwCode(Integer jwCode); + PayGOrder getOrderByPayStyle(Boolean payStyle); + List getOrdersBySuccessTimeRange(Integer startTime, Integer endTime); + List getOrdersByPage(@Param("offset") int offset, @Param("limit") int limit); + boolean createOrder(PayGOrder order); + boolean updateOrder(PayGOrder order); + boolean deleteOrder(Integer id); +} diff --git a/src/main/java/com/example/gb/service/impl/GoldBeanServiceimpl.java b/src/main/java/com/example/gb/service/impl/GoldBeanServiceImpl.java similarity index 58% rename from src/main/java/com/example/gb/service/impl/GoldBeanServiceimpl.java rename to src/main/java/com/example/gb/service/impl/GoldBeanServiceImpl.java index fa7e0e9..6c8834b 100644 --- a/src/main/java/com/example/gb/service/impl/GoldBeanServiceimpl.java +++ b/src/main/java/com/example/gb/service/impl/GoldBeanServiceImpl.java @@ -2,5 +2,5 @@ package com.example.gb.service.impl; import com.example.gb.service.GoldBeanService; -public class GoldBeanServiceimpl implements GoldBeanService { +public class GoldBeanServiceImpl implements GoldBeanService { } diff --git a/src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java new file mode 100644 index 0000000..6449b89 --- /dev/null +++ b/src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java @@ -0,0 +1,68 @@ +package com.example.gb.service.impl; + +import com.example.gb.bean.PayGOrder; +import com.example.gb.dao.GoldPayGOrderMapper; +import com.example.gb.service.GoldPayGOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class GoldPayGOrderServiceImpl implements GoldPayGOrderService { + + @Autowired + private GoldPayGOrderMapper goldPayGOrderMapper; + + @Override + public List getAllOrders() { + return goldPayGOrderMapper.findAll(); + } + + @Override + public PayGOrder getOrderById(Integer id) { + return goldPayGOrderMapper.findById(id); + } + + @Override + public PayGOrder getOrderByOrderNo(String orderNo) { + return goldPayGOrderMapper.findByOrderNo(orderNo); + } + + @Override + public List getOrderByJwCode(Integer jwCode) { + return goldPayGOrderMapper.findByJwCode(jwCode); + } + + + @Override + public PayGOrder getOrderByPayStyle(Boolean payStyle) { + return goldPayGOrderMapper.findByPayStyle(payStyle); + } + + @Override + public List getOrdersBySuccessTimeRange(Integer startTime, Integer endTime) { + return goldPayGOrderMapper.findBySuccessTimeRange(startTime, endTime); + } + + @Override + public List getOrdersByPage(int offset, int limit) { + return goldPayGOrderMapper.findByPage(offset, limit); + } + + @Override + public boolean createOrder(PayGOrder order) { + order.setAddTime((int) (System.currentTimeMillis() / 1000)); + return goldPayGOrderMapper.insert(order) > 0; + } + + @Override + public boolean updateOrder(PayGOrder order) { + return goldPayGOrderMapper.update(order) > 0; + } + + @Override + public boolean deleteOrder(Integer id) { + return goldPayGOrderMapper.deleteById(id) > 0; + } +} diff --git a/src/main/java/com/example/gb/util/Result.java b/src/main/java/com/example/gb/util/Result.java index f2e6d73..016fe0e 100644 --- a/src/main/java/com/example/gb/util/Result.java +++ b/src/main/java/com/example/gb/util/Result.java @@ -58,19 +58,17 @@ public class Result implements Serializable { } //失败响应 自定义状态码 默认为500 - public static Result error(BusinessException e) { + public static Result error(Exception e) { Result response = new Result(); // 定义默认错误码映射 final int defaultErrorCode = 400; // 检查 getCode() 是否为 null（如果是 Integer） - Integer code = e.getCode(); - if (code == null || code == 0) { + String code = e.getMessage(); + if (code == null) { response.setCode(defaultErrorCode); // 默认错误码 - } else { - response.setCode(code); } response.setMsg(e.getMessage()); - return response; + return Result.error(500, e.getMessage()); } public String toJson() throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt new file mode 100644 index 0000000..d6b6215 --- /dev/null +++ b/src/main/resources/banner.txt @@ -0,0 +1,8 @@ +===================================================== + .__ .___ .__ + ____ ____ | | __| _/____ ____ |__| ____ + / ___\ / _ \| | / __ |/ ___\/ _ \| |/ \ + / /_/ > <_> ) |__/ /_/ \ \__( <_> ) | | \ + \___ / \____/|____/\____ |\___ >____/|__|___| / +/_____/ \/ \/ \/ +===================================================== \ No newline at end of file diff --git a/src/main/resources/mapper/GoldPayGOrderMapper.xml b/src/main/resources/mapper/GoldPayGOrderMapper.xml new file mode 100644 index 0000000..a85d6f6 --- /dev/null +++ b/src/main/resources/mapper/GoldPayGOrderMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO pay_xxcg_com_g_order( + jwcode, order_no, type, merchant_id, price, count, + pay_style, platform, wx_prepay_id, wx_code_url, wx_transaction_id, + success_time, closed_time, refund_no, refund_time, paypal_orderId, + live_id, is_read, add_time) + VALUES ( + #{jwCode}, #{orderNo}, #{type}, #{merchantId}, #{price}, #{count}, + #{payStyle}, #{platForm}, #{wxPrepayId}, #{wxCodeUrl}, #{wxTransactionId}, + #{successTime}, #{closedTime}, #{refundNo}, #{refundTime}, #{paypalOrderId}, + #{liveId}, #{isRead}, #{addTime}) + + + + + UPDATE pay_xxcg_com_g_order + SET jwcode=#{jwCode}, order_no=#{orderNo}, type=#{type}, + merchant_id=#{merchantId}, price=#{price}, count=#{count}, + pay_style=#{payStyle}, platform=#{platForm}, + wx_prepay_id=#{wxPrepayId}, wx_code_url=#{wxCodeUrl}, + wx_transaction_id=#{wxTransactionId}, + success_time=#{successTime}, closed_time=#{closedTime}, + refund_no=#{refundNo}, refund_time=#{refundTime}, + paypal_orderId=#{paypalOrderId}, live_id=#{liveId}, + is_read=#{isRead}, add_time=#{addTime} + WHERE id = #{id} + + + + + DELETE FROM pay_xxcg_com_g_order WHERE id = #{id} + + diff --git a/src/test/java/com/example/gb/GbApplicationTests.java b/src/test/java/com/example/gb/GbApplicationTests.java deleted file mode 100644 index 6329ca0..0000000 --- a/src/test/java/com/example/gb/GbApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package src.test.java.com.example.gb; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class GbApplicationTests { - - @Test - void contextLoads() { - } - -}