费率相关更改

liuhaonan

2022-03-24 e306c0512dd3650f1882166da177800868265b27

费率相关更改

 pom.xml

@@ -105,6 +105,11 @@
                <artifactId>aliyun-java-sdk-iot</artifactId>
                <version>7.29.0</version>
            </dependency>
            <dependency>
                <groupId>cn.dreampie</groupId>
                <artifactId>jfinal-utils</artifactId>
                <version>0.2</version>
            </dependency>
        </dependencies>
    </dependencyManagement>


 ximon-admin/pom.xml

@@ -57,6 +57,11 @@
            <artifactId>alipay-sdk-java</artifactId>
            <version>4.17.9.ALL</version>
        </dependency>
        <dependency>
            <groupId>cn.dreampie</groupId>
            <artifactId>jfinal-utils</artifactId>
            <version>0.2</version>
        </dependency>
        <!--阿里云物联网 -->
    </dependencies>


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

@@ -32,7 +32,7 @@
     * @param charge
     * @return
     */
   // @PostMapping("/addC3mCharging")
    // @PostMapping("/addC3mCharging")
    public ResponseVO<Object> addC3mCharging(@RequestBody C3mChargingChargeParam charge) {
//        chargeService.save(charge);
//        chargeService.initCharge(charge);
@@ -41,16 +41,16 @@

    @PostMapping("/updateC3mCharging")
    public ResponseVO<Object> updateC3mCharging(@RequestBody List<C3mChargingCharge> chargeEntities) {
        if(chargeEntities.size()>5){
        if (chargeEntities.size() > 5) {
            throw new BusinessException("当前最高仅支持4组费率");
        }
        if(chargeEntities.size()==0){
        if (chargeEntities.size() == 0) {
            throw new BusinessException("最少需要一条费率");
        }
        return ResponseUtil.success(chargeService.updateCharge(chargeEntities));
    }

   // @PostMapping("/deleteC3mCharging")
    // @PostMapping("/deleteC3mCharging")
    public ResponseVO<Object> deleteC3mCharging(@RequestBody C3mChargingChargeParam charge) {
        boolean remove = chargeService.remove(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, charge.getC3Id())
                .eq(C3mChargingCharge::getHour, charge.getCharge()).eq(C3mChargingCharge::getHour, charge.getHour())
@@ -69,4 +69,5 @@
        return ResponseUtil.success(chargeService.getChargeByPoleId(PoleId));
    }


}

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

@@ -1,11 +1,20 @@
package com.sandu.ximon.admin.controller;

import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.domain.AlipayTradeWapPayModel;
import com.alipay.api.request.AlipayTradeWapPayRequest;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.config.AlipayConfig;
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.service.C3ChargingService;
import com.sandu.ximon.admin.service.C3mOrderService;
import com.sandu.ximon.admin.utils.ConfigCheckUtils;
import com.sandu.ximon.dao.domain.AliConfigEntity;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import lombok.AllArgsConstructor;
@@ -14,8 +23,12 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.SortedMap;

/**
 * @Author liuhaonan
@@ -28,10 +41,13 @@

    private final C3mOrderService c3mOrderService;
    private final C3ChargingService c3mService;
    private final UsrAlipayConfigService alipayConfigService;
    private final WxFastPayService wxPayService;


    /**
     * 退款
     *
     * @return
     */
    @PostMapping("/refond")
@@ -66,18 +82,81 @@
//        return R.ok().put("outTradeNo",c3mOrderEntity.getOutTradeNo())
//                .put("totalAmount",totalAmount);

        Map map=new HashMap();
        map.put("outTradeNo",c3mOrderEntity.getOutTradeNo());
        map.put("totalAmount",param.getTotalAmount());
        Map map = new HashMap();
        map.put("outTradeNo", c3mOrderEntity.getOutTradeNo());
        map.put("totalAmount", param.getTotalAmount());
        return ResponseUtil.success(map);
    }


    @PostMapping("/aliPay")
    public ResponseVO<Object> c3AliPay(@RequestBody PayParam param, HttpServletResponse response) {
        // 商户订单号，商户网站订单系统中唯一订单号，必填
        String out_trade_no = param.getOutTradeNo();
        System.out.println("订单号:" + out_trade_no);
        // 订单名称，必填
        String subject = "扫码充电支付(C3充电桩)";
        // 付款金额，必填，单位为元，精确到小数点后两位，取值范围[0.01,100000000]
        String total_amount = param.getTotalAmount().toString();
        // 商品描述，可空
        String body = "请勿付款，测试用";
        // 超时时间 可空
        String timeout_express = "5m";
        // 销售产品码 必填
        String product_code = "QUICK_WAP_WAY";
        /**********************/
        AliConfigEntity alipayConfigEntity = alipayConfigService.getConfigByPoleId(param.getPoleId());
        String checkStr = ConfigCheckUtils.checkAlipayConfig(alipayConfigEntity);
        if (checkStr != null) {
            try {
                response.getWriter().write(checkStr);
                return ResponseUtil.fail("支付完成失败");
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
        //调用RSA签名方式
        AlipayClient client = new DefaultAlipayClient(AlipayConfig.gatewayUrl, alipayConfigEntity.getAppId(), alipayConfigEntity.getPrivateKey(), AlipayConfig.format, AlipayConfig.charset, alipayConfigEntity.getPublicKey(), AlipayConfig.sign_type);
        AlipayTradeWapPayRequest alipay_request = new AlipayTradeWapPayRequest();

        // 封装请求支付信息
        AlipayTradeWapPayModel model = new AlipayTradeWapPayModel();
        model.setOutTradeNo(out_trade_no);
        model.setSubject(subject);
        model.setTotalAmount(total_amount);
        model.setBody(body);
        model.setTimeoutExpress(timeout_express);
        model.setProductCode(product_code);
        model.setQuitUrl(C3mOrder.REQUEST_URL + param.getPoleId() + "/" + new Date().getTime());
        alipay_request.setBizModel(model);
        // 设置异步通知地址
        alipay_request.setNotifyUrl(C3mOrder.REQUEST_URL + param.getPoleId() + "/" + new Date().getTime());
        // 设置同步地址
        alipay_request.setReturnUrl(C3mOrder.REQUEST_URL + param.getPoleId() + "/" + new Date().getTime());

        // form表单生产
        String form = "";
        try {
            // 调用SDK生成表单
            form = client.pageExecute(alipay_request).getBody();
            response.setContentType("text/html;charset=" + AlipayConfig.charset);
            response.getWriter().write(form);//直接将完整的表单html输出到页面
            response.getWriter().flush();
            response.getWriter().close();
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ResponseUtil.success("支付完成");
    }

    @RequestMapping("/wxpay")
    public ResponseVO<Object> c3Wxpay(@RequestBody PayParam param) {

        //String result = wxPayService.miniAppPay(outTradeNo, totalAmount, streetlightId);
        SortedMap<Object, Object> result = wxPayService.appPay("扫码充电支付(C3充电桩)", param.getOutTradeNo(), param.getWxPayTotalAmount(), param.getPoleId());

        return ResponseUtil.success(result);
    }


}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/PayParam.java

@@ -9,11 +9,18 @@
 */
@Data
public class PayParam {
    Long poleId;

    String orderType;
    private Long poleId;

    Double totalAmount;
    private String orderType;

    Integer subscribeChargingCapacity;
    private Double AliPayTotalAmount;

    private Double totalAmount;

    private Integer WxPayTotalAmount;

    private Integer subscribeChargingCapacity;

    private String outTradeNo;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java

@@ -1,7 +1,7 @@
package com.sandu.ximon.admin.pay.wx;

import cn.dreampie.encription.EncriptionKit;
import cn.hutool.core.codec.Base64;
import cn.hutool.crypto.SecureUtil;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
@@ -35,45 +35,58 @@
    private final com.github.binarywang.wxpay.service.WxPayService wxPayService;
    //private final WxPayProperties wxPayProperties;
    public static final String WECHAT_ORDER_PAY_CALLBACK_URL = "http://49.235.239.118:20012/callback/pay/wechatCallback";
    private final UsrWxPayConfigService wxPayConfigService;

    /**
     * app支付
     *
     * @param openId
     * @param body     商品描述
     * @param orderId  订单id
     * @param totalFee 支付金额（分）
     * @return
     */
    public SortedMap<Object, Object> miniAppPay(WxPayService wxPayService, String openId, String body,
                                                String orderId, int totalFee, String callbackUrl) {
    public SortedMap<Object, Object> appPay(String body, String orderSn, int totalFee,Long poleId) {
        WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
        WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
        wxPayUnifiedOrderRequest.setBody(body);
        wxPayUnifiedOrderRequest.setOutTradeNo(orderId);
        wxPayUnifiedOrderRequest.setOutTradeNo(orderSn);
        wxPayUnifiedOrderRequest.setTotalFee(totalFee);
        wxPayUnifiedOrderRequest.setOpenid(openId);

        wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
        //wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
        wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
        wxPayUnifiedOrderRequest.setNotifyUrl(callbackUrl);
        wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
        wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
        wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.APP);

        try {
            WxPayUnifiedOrderResult wxPayUnifiedOrderResult = wxPayService.unifiedOrder(wxPayUnifiedOrderRequest);
            String time = String.valueOf(System.currentTimeMillis() / 1000);
            if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayUnifiedOrderResult.getResultCode())) {
                SortedMap<Object, Object> hashMap = new TreeMap<>();
                hashMap.put("appId", wxPayUnifiedOrderResult.getAppid());
                SortedMap<Object, Object> parameters = new TreeMap<>();
                /*hashMap.put("appId", wxPayUnifiedOrderResult.getAppid());
                hashMap.put("nonceStr", wxPayUnifiedOrderResult.getNonceStr());
                hashMap.put("package", "prepay_id=" + wxPayUnifiedOrderResult.getPrepayId());
                hashMap.put("prepayId", wxPayUnifiedOrderResult.getPrepayId());
                //  hashMap.put("package", "prepay_id=" + wxPayUnifiedOrderResult.getPrepayId());
                hashMap.put("signType", WxPayConstants.SignType.MD5);
                hashMap.put("timeStamp", time);
                String wechatSign = createSign(wxPayService.getConfig().getMchKey(), hashMap);
                hashMap.put("paySign", wechatSign);
                return hashMap;
                hashMap.put("partnerid", wxPayProperties.getMchId());*/
                parameters.put("appid", wxPayUnifiedOrderResult.getAppid());

                parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 随机字符串
                parameters.put("partnerid", wxConfig.getMchId()); // 商户id

                //  parameters.put("out_trade_no", orderId);//商户订单号
                parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
                parameters.put("package", "Sign=WXPay");
                parameters.put("timestamp", time);

                String sign = createSign(parameters, wxConfig.getPrivateKey());

                //hashMap.put("paySign", wechatSign);
                parameters.put("Sign", sign);
                return parameters;
            } else {
                log.error("微信支付失败，{}", wxPayUnifiedOrderResult.getErrCodeDes());
                throw new BusinessException("微信支付失败，" + wxPayUnifiedOrderResult);
                throw new BusinessException("微信支付失败，" + wxPayUnifiedOrderResult.getErrCodeDes());
            }
        } catch (WxPayException e) {
            log.error("微信支付失败，{}", e.getErrCodeDes());
@@ -81,7 +94,7 @@
        }
    }

    private String createSign(String mchKey, SortedMap<Object, Object> parameters) {
/*    private String createSign(SortedMap<Object, Object> parameters) {
        StringBuffer sb = new StringBuffer();
        Set es = parameters.entrySet();// 所有参与传参的参数按照accsii排序（升序）
        for (Object e : es) {
@@ -92,9 +105,32 @@
                sb.append(k + "=" + v + "&");
            }
        }
        sb.append("key=" + mchKey);
        sb.append("key=" + wxPayProperties.getMchKey());
        System.out.println("字符串拼接后是:" + sb.toString());
        return SecureUtil.md5(sb.toString()).toUpperCase();
    }*/

    /**
     * @param parameters
     * @return
     */
    @SuppressWarnings("rawtypes")
    private String createSign(SortedMap<Object, Object> parameters, String Key) {
        StringBuffer sb = new StringBuffer();
        Set es = parameters.entrySet();// 所有参与传参的参数按照accsii排序（升序）
        Iterator it = es.iterator();
        while (it.hasNext()) {
            Map.Entry entry = (Map.Entry) it.next();
            String k = (String) entry.getKey();
            Object v = entry.getValue();
            if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
                sb.append(k + "=" + v + "&");
            }
        }
        sb.append("key=" + Key);
        System.out.println("字符串拼接后是:" + sb.toString());
        String sign = EncriptionKit.encrypt(sb.toString()).toUpperCase();
        return sign;
    }

    public WxPayOrderNotifyResult parseOrderNotifyResult(WxPayService wxPayService, String xmlData) {
@@ -180,6 +216,7 @@

    /**
     * 退款
     *
     * @param totalAmount
     * @param refundAmount
     * @param outTradeNo

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java

@@ -222,10 +222,17 @@
            throw new BusinessException("删除任务失败");
        }

        boolean del;
        // 删除绑定灯杆
        if (!lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList))) {
            throw new BusinessException("删除绑定灯杆失败");
        }
//        if (!lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).notIn(LightTaskPoleRelation::getTaskId, taskIdList))) {
//            throw new BusinessException("未找到任务/灯杆绑定关系");
//        }
//        lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
        taskIdList.forEach(
                taskId->{
                    lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId,taskId));
                }
        );

        return true;
    }