xiongzhu 3 лет назад
Родитель
Сommit
2bc1d1c04b

+ 3 - 1
src/main/java/com/izouma/yags/config/Constants.java

@@ -32,13 +32,15 @@ public interface Constants {
         String AUCTION        = "藏品拍卖";
         String AUCTION_RETURN = "保证金退款";
         String REWARD         = "拍卖奖励";
-        String RETURN         = "失败退回";
+        String RETURN         = "退回";
         String PAY            = "支付";
         String RECHARGE       = "充值";
         String DENY           = "拒绝";
         String BONUS          = "奖励";
         String REFUND         = "退款";
         String OTHER          = "其他";
+        String PUNISH         = "惩罚";
+        String COMPENSATION   = "补偿";
     }
 
 }

+ 5 - 5
src/main/java/com/izouma/yags/service/RoomService.java

@@ -480,13 +480,13 @@ public class RoomService {
             if (j.getTeam().equals(team)) {
                 j.setStatus(JoinRoomStatus.WIN);
                 userBalanceService.modifyBalance(j.getUserId(), room.getBonus(), Constants.BalanceDesc.BONUS);
-                userBalanceService.modifyBalance(j.getUserId(), room.getBonus().multiply(new BigDecimal("0.5")),
-                        Constants.BalanceDesc.BONUS);
+                userBalanceService.modifyBalance(j.getUserId(), room.getBonus().multiply(new BigDecimal("0.25")),
+                        Constants.BalanceDesc.COMPENSATION);
             } else {
                 j.setStatus(JoinRoomStatus.LOSE);
-                userBalanceService.modifyBalance(j.getUserId(), room.getBonus().negate(), Constants.BalanceDesc.BONUS);
-                userBalanceService.modifyBalance(j.getUserId(), room.getBonus().multiply(new BigDecimal("0.5")).negate(),
-                        Constants.BalanceDesc.BONUS);
+                userBalanceService.modifyBalance(j.getUserId(), room.getBonus().negate(), Constants.BalanceDesc.RETURN);
+                userBalanceService.modifyBalance(j.getUserId(), room.getBonus().multiply(new BigDecimal("0.25")).negate(),
+                        Constants.BalanceDesc.PUNISH);
             }
             joinRoomRepo.save(j);
         }

+ 10 - 6
src/main/java/com/izouma/yags/utils/RecognizeUtil.java

@@ -3,16 +3,16 @@ package com.izouma.yags.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.kevinsawicki.http.HttpRequest;
-import org.apache.commons.io.FileUtils;
+import lombok.extern.slf4j.Slf4j;
 
 import javax.imageio.ImageIO;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDateTime;
 import java.util.Base64;
 
+@Slf4j
 public class RecognizeUtil {
     private static String        accessToken = null;
     private static LocalDateTime expireAt    = null;
@@ -34,16 +34,20 @@ public class RecognizeUtil {
         }
         JSONObject body = new JSONObject();
         body.put("image", image);
-        return JSON.parseObject(HttpRequest.post("https://aip.baidubce.com/rpc/2.0/ai_custom_bml/v1/classification/game1?access_token=" + accessToken)
+        HttpRequest request = HttpRequest.post("https://aip.baidubce.com/rpc/2.0/ai_custom_bml/v1/classification/game1?access_token=" + accessToken)
                 .header("Content-Type", "application/json")
-                .send(body.toJSONString())
-                .body());
+                .send(body.toJSONString());
+        int code = request.code();
+        String res = request.body();
+        log.info("recognize code ={}, result={}", code, res);
+        return JSON.parseObject(res);
     }
 
     public static void main(String[] args) throws IOException {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         ImageIO.write(ImageIO.read(new URL("https://cdn.raex.vip/image/2022-08-08-14-51-42lexfxYDl.jpg")), "jpg", os);
-        JSONObject jsonObject = recognize(Base64.getEncoder().encodeToString(os.toByteArray()));;
+        JSONObject jsonObject = recognize(Base64.getEncoder().encodeToString(os.toByteArray()));
+        ;
         System.out.println(JSON.toJSONString(jsonObject, true));
     }
 }