Merge remote-tracking branch 'origin/pay_master' into pay_master

houruijun

2020-09-28 e0395c5454534e7cf657b10045d00e4042dc7e71

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java

@@ -161,7 +161,11 @@
            List<String> list=new ArrayList<>();
            list.add(str);
            list.add(aliCode);
            return ResultBody.ok().data(list);
            Map<String,Object> map=new HashMap<>();
            map.put("list",list);
            double v = Double.parseDouble(modelByObject.getPayPrice().toString())/100;
            map.put("payPrice",v);
            return ResultBody.ok().data(map);
        }
        saasClientPay.setId(UUID.randomUUID().toString().replace("-",""));
        saasClientPay.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
@@ -192,7 +196,8 @@
        list.add(aliCode);
        Map<String,Object> map=new HashMap<>();
        map.put("list",list);
        map.put("payPrice",byObject.getPayPrice());
        double v = Double.parseDouble(byObject.getPayPrice().toString())/100;
        map.put("payPrice",v);
        return ResultBody.ok().data(map);
    }
    /**