lidongdong
2023-03-16 303466a6535c8f74cb183161cf916e9c1df61e10
修改邻里圈详情报错
3个文件已修改
21 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -255,15 +255,19 @@
    @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){
        String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId,openId);
        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){
        String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId,openId);
        return R.ok(map);
    }
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java
@@ -46,7 +46,7 @@
//    static String url = "https://test-api-open.chinaums.com/v1/netpay/wx/unified-order";
    static String url = "https://api-mop.chinaums.com/v1/netpay/wx/unified-order";
    public static String sendOrder(String totalAmount,String orderDesc,String productId)
    public static String sendOrder(String totalAmount,String orderDesc,String productId,String OpenId)
    {
        //1. 组建请求报文
        LocalDateTime time=DateUtils.getCurrentDate();
@@ -62,6 +62,7 @@
        reqBody.productId = productId;
        reqBody.notifyUrl = NOTIFYURL;
        reqBody.tradeType = "MINI";
        reqBody.subOpenId = OpenId;
        System.out.println("request body:\n"+reqBody);
        //2. 获取认证报文,timestamp为当前日期,老旧日期无法请求成功
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -793,7 +793,11 @@
        if (comActNeighborCircleDO.getTopicId() != null) {
            ComActNeighborCircleTopicDO circleTopicDO =
                comActNeighborCircleTopicMapper.selectById(comActNeighborCircleDO.getTopicId());
            vo.setTopicName(circleTopicDO.getName());
            if(circleTopicDO!=null && !StringUtils.isEmpty(circleTopicDO.getName()))
            {
                vo.setTopicName(circleTopicDO.getName());
            }
        }
        return R.ok(vo);
    }