You've already forked FrameTour-BE
管理
This commit is contained in:
@ -33,10 +33,6 @@ public class AppStatisticsController {
|
||||
@ApiOperation("支付订单金额、预览_支付转化率、扫码_付费用户转化率")
|
||||
@PostMapping("/one")
|
||||
public ApiResponse<AppSta1VO> oneStatistics(@RequestBody CommonQueryReq query) {
|
||||
JwtInfo worker = JwtTokenUtil.getWorker();
|
||||
log.info("oneStatistics 当前用户信息:{}", worker);
|
||||
Long scenicId = worker.getScenicId();
|
||||
query.setScenicId(scenicId);
|
||||
|
||||
return statisticsService.oneStatistics(query);
|
||||
}
|
||||
|
@ -193,7 +193,6 @@ public class ViidController {
|
||||
*/
|
||||
@RequestMapping(value = "/Faces", method = RequestMethod.POST)
|
||||
@IgnoreLogReq
|
||||
@RequestToFile
|
||||
public VIIDBaseResp faces(@RequestBody FaceUploadReq req) {
|
||||
FaceListObject faceListObject = req.getFaceListObject();
|
||||
List<FaceObject> faceObject = faceListObject.getFaceObject();
|
||||
|
@ -245,7 +245,7 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
|
||||
private String calculateConversionRate(Integer num1,Integer num2){
|
||||
//转化率格式
|
||||
DecimalFormat df = new DecimalFormat("0.00");
|
||||
if(num2==0){
|
||||
if(num2 == null || num2==0){
|
||||
return "0.00";
|
||||
}else {
|
||||
BigDecimal result = new BigDecimal(num1).divide(new BigDecimal(num2), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
||||
@ -342,12 +342,15 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
|
||||
//当前周期的支付订单金额
|
||||
vo.setNowOrderAmount(orderAmountDf.format(orderAmount));
|
||||
//当前周期预览_支付转化率、扫码_付费用户转化率
|
||||
if(pay==0){
|
||||
if(preview==0){
|
||||
vo.setNowPreviewPay("0.00");
|
||||
}else {
|
||||
BigDecimal previewPay = new BigDecimal(pay).divide(new BigDecimal(preview), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
||||
vo.setNowPreviewPay(df.format(previewPay));
|
||||
}
|
||||
if(scanCode==0){
|
||||
vo.setNowScanCodePay("0.00");
|
||||
}else {
|
||||
BigDecimal previewPay = new BigDecimal(payCount).divide(new BigDecimal(preview), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
||||
vo.setNowPreviewPay(df.format(previewPay));
|
||||
BigDecimal scanCodePay = new BigDecimal(pay).divide(new BigDecimal(scanCode), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
||||
vo.setNowScanCodePay(df.format(scanCodePay));
|
||||
}
|
||||
|
Reference in New Issue
Block a user