bug修改

无关风月

2024-09-27 e7e3c9e98ddeb7f7ec7213a2428a7f945014ebbd

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java

@@ -118,7 +118,10 @@
         TAppUserAddress data = appUserClient.getAddressById(byId.getAppUserAddressId()).getData();
         if (data != null) {
            byId.setReceivingName(data.getName() + "-" + data.getPhone());
            byId.setReceivingAddress(data.getAddress());
            byId.setReceivingAddress(data.getProvince()+data.getCity()
                  +(data.getDistrict()==null?"":data.getDistrict())
                  +(data.getAddress()==null?"":data.getAddress())
                  +(data.getHouseNumber()==null?"":data.getHouseNumber()));
         }
      }
      if (byId.getOrderType()==1){
@@ -157,9 +160,11 @@
            WxPaymentRefundModel wxPaymentRefundModel = new WxPaymentRefundModel();
            wxPaymentRefundModel.setTransaction_id(byId.getSerialNumber());
            wxPaymentRefundModel.setOut_trade_no(byId.getCode());
            wxPaymentRefundModel.setOut_refund_no(OrderCodeUtil.getOrderCode("GW"));
            wxPaymentRefundModel.setOut_refund_no(OrderCodeUtil.getOrderCode("GWTK"));
            wxPaymentRefundModel.setReason("后台购物订单退款");
            wxPaymentRefundModel.setNotify_url("/payment/wx/refund/notify");

            // todo 部署到线上之后写回调地址
//            wxPaymentRefundModel.setNotify_url("");
            String string = byId.getPaymentAmount().multiply(new BigDecimal("100")).toString();
            if (string.contains(".")) {
               string = string.substring(0, string.indexOf("."));
@@ -167,6 +172,7 @@
            int i = Integer.parseInt(string);
            WxPaymentRefundModel.RefundAmount refundAmount = new WxPaymentRefundModel.RefundAmount();
            refundAmount.setTotal(i);
            refundAmount.setCurrency("CNY");
            refundAmount.setRefund(i);
            wxPaymentRefundModel.setAmount(refundAmount);
            wxPaymentClient.refundOrderR(wxPaymentRefundModel);
@@ -175,20 +181,21 @@
            // 支付宝
            RefundReq refundReq = new RefundReq();
            refundReq.setOutTradeNo(byId.getSerialNumber());
            String gw = OrderCodeUtil.getOrderCode("GW");
            String gw = OrderCodeUtil.getOrderCode("GWTK");
            refundReq.setOutRequestNo(gw);
            refundReq.setRefundAmount(byId.getPaymentAmount().toString());
            refundReq.setRefundReason("后台退款");
            refundReq.setRefundReason("后台购物订单退款");
            RefundResp data = aliPaymentClient.refund(refundReq).getData();
            if (data != null) {
               // 退款成功 回退优惠券
//               byId.setStatus(4);
               byId.setStatus(4);
               if (byId.getAppCouponId() != null) {
                  appCouponClient.refund(byId.getAppCouponId().toString());
                  byId.setRefundCode(gw);
                  byId.setRefundAmount(byId.getPaymentAmount());
                  byId.setRefundStatus(2);
                  byId.setRefundSerialNumber(data.getTradeNo());
                  shoppingOrderService.updateById(byId);
               }
            }
            break;