Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2023-08-23 ed35e27fd377db24fd5ff83848824f6525f1382c

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java

@@ -3,16 +3,19 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.applets.unionpay.Refund;
import com.panzhihua.applets.unionpay.UnifiedOrder;
import com.panzhihua.applets.unionpay.*;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.wx.UnionpayCarWash;
import com.panzhihua.common.model.vos.community.Base64File;
import com.panzhihua.common.utlis.*;
import net.coobird.thumbnailator.Thumbnails;
@@ -39,6 +42,7 @@
import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
import static com.panzhihua.common.utlis.PayUtil.makeUUID;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -255,33 +259,61 @@

    @ApiOperation("uu洗车银联下单接口")
    @GetMapping("/uuUnionpayPay")
    public R uuUnionpayPay(@RequestParam("amount")String amount,@RequestParam("productId")String productId){
        String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId);
    public R uuUnionpayPay(@RequestParam("amount")String amount,
                           @RequestParam("productId")String productId,
                           @RequestParam("openId")String openId){

        LocalDateTime time=DateUtils.getCurrentDate();
        String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
        String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId,openId,time,merOrderId);
        communityService.add(productId,merOrderId,amount);
        return R.ok(map);
    }

    @ApiOperation("无水洗车银联下单接口")
    @GetMapping("/wsUnionpayPay")
    public R wsUnionpayPay(@RequestParam("amount")String amount,@RequestParam("productId")String productId){
        String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId);
    public R wsUnionpayPay(@RequestParam("amount")String amount,
                           @RequestParam("productId")String productId,
                           @RequestParam("openId")String openId){
        LocalDateTime time=DateUtils.getCurrentDate();
        String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
        String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId,openId,time,merOrderId);
        communityService.add(productId,merOrderId,amount);
        return R.ok(map);
    }

    @ApiOperation("uu洗车银联退款接口")
    @GetMapping("/uuUnionpayRefund")
    public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,@RequestParam("refundOrderId")String refundOrderId){
    public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
                                 @RequestParam("refundOrderId")String refundOrderId){
        String map= Refund.sendOrder(refundAmount,refundOrderId);
        return R.ok(map);
    }

    @ApiOperation("无水洗车银联退款接口")
    @GetMapping("/wsUnionpayRefund")
    public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,@RequestParam("refundOrderId")String refundOrderId){
    public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
                                 @RequestParam("refundOrderId")String refundOrderId){
        String map= Refund.sendOrder(refundAmount,refundOrderId);
        return R.ok(map);
    }


    @ApiOperation("银联支付查询接口")
    @GetMapping("/unionpayQuery")
    public R unionpayRefundPay(@RequestParam("merOrderId")String merOrderId){
        String map= Query.query(merOrderId);
        return R.ok(map);
    }

    @ApiOperation("银联退款查询接口")
    @GetMapping("/unionpayRefundQuery")
    public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){
        String map= RefundQuery.refundQuery(merOrderId);
        return R.ok(map);
    }