明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2024-08-28 fe2e226da5a7505b343517e828f0d8c3a496fb7a 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java


@@ -24,6 +24,7 @@


import com.ruoyi.payment.api.model.RefundReq;


import com.ruoyi.payment.api.model.RefundResp;


import com.ruoyi.payment.api.model.WxPaymentRefundModel;


import com.ruoyi.payment.api.vo.WxRefundNotifyResp;


import com.ruoyi.system.api.domain.SysUser;


import com.ruoyi.system.api.feignClient.SysUserClient;


import io.swagger.annotations.Api;


@@ -33,6 +34,7 @@


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.util.Arrays;


import java.util.Date;


import java.util.List;


@@ -195,7 +197,7 @@


   


   


   @GetMapping("/getMyShoppingOrderInfo/{id}")


   @ApiOperation(value = "获取购买订单详情", tags = {"小程序-商城购买订单"})


   @ApiOperation(value = "获取购买订单详情", tags = {"小程序-商城购买订单","管理后台-支付订单-订单信息"})


   public AjaxResult<MyShoppingOrderInfo> getMyShoppingOrderInfo(@PathVariable String id){


      MyShoppingOrderInfo info = shoppingOrderService.getMyShoppingOrderInfo(id);


      return AjaxResult.success(info);


@@ -228,6 +230,21 @@


      return shoppingOrderService.cancelOrder(id);


   }


   


   /**


    * 商城订单取消微信退款回调


    */


   @PostMapping("/cancelShoppingOrderWxRefund")


   public void cancelShoppingOrderWxRefund(HttpServletRequest request){


      WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();


      if(null != data){


         String out_refund_no = data.getOut_refund_no();


         String refund_id = data.getRefund_id();


         String tradeState = data.getTradeState();


         String success_time = data.getSuccess_time();


         shoppingOrderService.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);


      }


   }


	


   


   


   @ResponseBody


@@ -250,7 +267,7 @@


         shoppingOrder.setCouponId(exchangeDto.getGoodId());


      }


      shoppingOrder.setPurchaseQuantity(exchangeDto.getNum());


      shoppingOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));


      shoppingOrder.setAppUserAddressId(exchangeDto.getAddressId());


      shoppingOrder.setOrderAmount(exchangeDto.getOrderPrice());


      if (exchangeDto.getCouponId()!=null) {


         shoppingOrder.setAppCouponId(exchangeDto.getCouponId());