changes

liuhaonan

2022-09-06 b353cecfa4181d281243df5a70d1de5cc373e35d

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java

@@ -9,7 +9,6 @@
import com.sandu.ximon.admin.param.PayParam;
import com.sandu.ximon.admin.pay.alipay.UsrAlipayConfigService;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
import com.sandu.ximon.admin.security.wxOpenId.OpenId;
import com.sandu.ximon.admin.service.C3ChargingService;
import com.sandu.ximon.admin.service.C3mChargingChargeService;
import com.sandu.ximon.admin.service.C3mOrderService;
@@ -21,6 +20,7 @@
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.SortedMap;

@@ -45,14 +45,12 @@
     *
     * @return
     */
    @PostMapping("/refond")
    public ResponseVO<Object> refond(@RequestBody PayParam params) {
    @PostMapping("/refund")
    public ResponseVO<Object> refund(@RequestBody PayParam params) {
        if (params.getOutTradeNo().isEmpty() || params.getOutTradeNo() == null) {
            throw new BusinessException("退款参数不能为空");
        }
        // 0.00 用于占位 没有实际用处  退款接口好几个地方调用  不太好改
        return ResponseUtil.success(c3mOrderService.orderRefund(params.getOutTradeNo(),
                0.00));
        return ResponseUtil.success(c3mOrderService.orderRefund(params.getOutTradeNo()));
    }

    /**
@@ -62,7 +60,7 @@
     */
    @AnonymousAccess
    @PostMapping("/advancePay")
    public ResponseVO<Object> advancePayOrder(@OpenId String openId, @RequestBody PayParam param) throws WxErrorException {
    public ResponseVO<Object> advancePayOrder(HttpServletRequest request, @RequestBody PayParam param) throws WxErrorException, InterruptedException {
        if (param.getOpenId().isEmpty()) {
            throw new BusinessException("微信code不能为空");
        }
@@ -84,15 +82,10 @@
        //生成订单
        C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, "wxpay"
                , totalAmount, param.getSubscribeChargingCapacity(), param.getOpenId());
        if (null == c3mOrderEntity) {
            throw new BusinessException("该充电桩正被使用!");
        }

        param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
        param.setTotalAmount(c3mOrderEntity.getTotalAmount());
        String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
        String s = WxFastPayService.parseWxAmount(c3mOrderEntity.getTotalAmount().toString());
        //生成微信预付订单
        SortedMap<Object, Object> result = wxPayService.miniAppPay("扫码充电支付(C3充电桩)", param.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
        SortedMap<Object, Object> result = wxPayService.miniAppPay(request,"扫码充电支付(C3充电桩)", c3mOrderEntity.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
        return ResponseUtil.success(result);
    }