From a071c70355a0ac580ff124e6fbc4bf4c07d9efb0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 06 八月 2025 12:30:27 +0800
Subject: [PATCH] 所有代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 103 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 31 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index c08a457..9666f04 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -20,10 +20,15 @@
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.mapper.OrderMapper;
+import com.ruoyi.order.model.ChargeOrder;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.service.ChargeOrderService;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.payment.model.UniPayCallbackResult;
+import com.ruoyi.order.util.payment.wechat.PayMoneyUtil;
+import com.ruoyi.order.util.payment.wx.WechatPayService;
+import com.ruoyi.order.util.payment.wx.vo.PayResult;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.util.vo.ShopAnalysisVO;
import com.ruoyi.order.vo.*;
@@ -37,10 +42,13 @@
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
@@ -70,6 +78,8 @@
@Resource
private OrderService orderService;
@Resource
+ private ChargeOrderService chargeOrderService;
+ @Resource
private TokenService tokenService;
@Resource
private BaseSettingClient baseSettingClient;
@@ -82,7 +92,10 @@
@Resource
private ShopClient shopClient;
-
+ @Resource
+ private PayMoneyUtil payMoneyUtil;
+ @Resource
+ private WechatPayService wechatPayService;
@ResponseBody
@@ -104,12 +117,19 @@
* 订单支付回调通知
*/
@ResponseBody
- @GetMapping("/orderPaymentCallback")
- public void orderPaymentCallback(UniPayCallbackResult uniPayCallbackResult, HttpServletResponse response){
- String jsonString = JSONObject.toJSONString(uniPayCallbackResult);
+ @PostMapping("/orderPaymentCallback")
+ public void orderPaymentCallback(HttpServletRequest request, HttpServletResponse response){
+// String jsonString = JSONObject.toJSONString(uniPayCallbackResult);
+ System.err.println("1111111111111");
+ PayResult payResult= null;
+ try {
+ payResult = wechatPayService.processNotify(request);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
System.out.println("1111111111111111111111");
- System.out.println(jsonString);
- R callback = orderService.orderPaymentCallback(uniPayCallbackResult);
+// System.out.println(jsonString);
+ R callback = orderService.orderPaymentCallback(payResult);
if(callback.getCode() == 200){
response.setStatus(200);
PrintWriter out = null;
@@ -132,7 +152,7 @@
@ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
@GetMapping("/getMyOrderList")
- public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status) {
+ public TableDataInfo<OrderVO> getMyOrderList(@RequestParam("订单状态") Integer status) {
startPage();
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
@@ -175,19 +195,30 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@GetMapping("/writeOff")
- public R<Void> writeOff(@ApiParam("id") String id, @ApiParam("shopId") Integer shopId) {
+ public R<Void> writeOff(@RequestParam("id") String id, @RequestParam("shopId") Integer shopId) {
orderService.writeOff(id, shopId);
return R.ok();
}
@GetMapping("/getShopOrderList")
@ApiOperation(value = "获取订单列表", tags = {"门店后台-订单管理", })
- public R<IPage<OrderPageListVo>> getShopOrderList(@ApiParam("模糊查询：订单编号/商品名/手机号 ") String content ,
- @ApiParam("订单状态") Integer status,
- @ApiParam("门店id") Integer shopId,
- @ApiParam("页码") @RequestParam("pageNum") Integer pageNum,
- @ApiParam("每一页数据大小") @RequestParam("pageSize") Integer pageSize) {
+ public R<IPage<OrderPageListVo>> getShopOrderList(@RequestParam("content") String content ,
+ @RequestParam("status") Integer status,
+ @RequestParam("shopId") Integer shopId,
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
return R.ok(orderService.getShopOrderList(content,status,shopId,pageNum,pageSize));
+ }
+ @PostMapping("/importExpress")
+ @ApiOperation(value = "2.0新增导入订单", tags = {"门店后台-订单管理"})
+ public R importExpress(@RequestParam("file") MultipartFile file) {
+ /* JSONObject jsonObject = JSONObject.parseObject(url);
+ String url2 = jsonObject.getString("url");*/
+ if (file.isEmpty()) {
+ return R.fail("请选择要上传的文件");
+ }
+
+ return orderService.importExpress(file);
}
@PutMapping("/shopCancelOrder/{orderId}")
@@ -406,31 +437,31 @@
*/
/**
* 订单取消支付回退
- *
- * @param refundCallbackResult
- * @param response
- * @return
*/
@ResponseBody
- @GetMapping("/refundPayMoneyCallback")
- public void refundPayMoneyCallback(RefundCallbackResult refundCallbackResult, HttpServletResponse response) {
- R callback = orderService.refundPayMoneyCallback(refundCallbackResult);
+ @PostMapping("/refundPayMoneyCallback")
+ public String refundPayMoneyCallback( @RequestBody(required = false) String xmlData) {
+ R callback = orderService.refundPayMoneyCallback(xmlData);
if (callback.getCode() == 200) {
- response.setStatus(200);
- PrintWriter out = null;
- try {
- out = response.getWriter();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- out.println("success");
- out.flush();
- out.close();
+ return "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+ }else {
+ System.err.println("支付回退错误："+callback.getMsg());
+ return "<xml><return_code><![CDATA[FAIL]]></return_code></xml>";
}
}
-
+ /**
+ * 获取商品销售数量
+ *
+ * @param goodsId
+ * @return
+ */
+ @PostMapping(value = "/getList")
+ R<List<ChargeOrder>> getList(@RequestParam("siteId") Integer siteId) {
+ List<ChargeOrder> list = chargeOrderService.lambdaQuery().eq(ChargeOrder::getPowerStationId, siteId).list();
+ return R.ok(list);
+ }
/**
* 获取商品销售数量
*
@@ -778,5 +809,15 @@
return R.ok(orderService.getMap(queryWrapper));
}
+ /**
+ * 获取商户RSA加密公钥
+ */
+
+ @GetMapping("/getRsaPublicKey")
+ public R<Void> getRsaPublicKey(){
+ wechatPayService.getRsaPublicKey();
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1