Merge remote-tracking branch 'origin/master'

alien-entity/src/main/java/shop/alien/entity/second/vo/SellGoodsVo.java

@@ -113,5 +113,58 @@ public class SellGoodsVo extends SecondGoods {
     @ApiModelProperty(value = "交易对方的用户ID")
     private Integer otherPartyId;
 
+    @ApiModelProperty(value = "商品id")
+    @TableField("goods_id")
+    private Integer goodsId;
+
+    @ApiModelProperty(value = "交易地点(经纬度地址)")
+    @TableField("transaction_latitude_longitude_address")
+    private String transactionLatitudeLongitudeAddress;
+
+
+    @ApiModelProperty(value = "买家是否签到  0-未签到  1-已签到")
+    @TableField("buyer_sign_in")
+    private Integer buyerSignIn;
+
+    @ApiModelProperty(value = "买家签到时间")
+    @TableField("buyer_sign_in_time")
+    private Date buyerSignInTime;
+
+    @ApiModelProperty(value = "买家签到地点(经纬度)")
+    @TableField("buyer_sign_in_latitude_longitude")
+    private String buyerSignInLatitudeLongitude;
+
+    @ApiModelProperty(value = "买家签到地点(经纬度)")
+    @TableField("buyer_sign_in_latitude_longitude_address")
+    private String buyerSignInLatitudeLongitudeAddress;
+
+    @ApiModelProperty(value = "卖家是否签到  0-未签到  1-已签到")
+    @TableField("seller_sign_in")
+    private Integer sellerSignIn;
+
+    @ApiModelProperty(value = "卖家签到时间")
+    @TableField("seller_sign_in_time")
+    private Date sellerSignInTime;
+
+    @ApiModelProperty(value = "卖家签到地点(经纬度)")
+    @TableField("seller_sign_in_latitude_longitude")
+    private String sellerSignInLatitudeLongitude;
+
+    @ApiModelProperty(value = "卖家签到地点(经纬度地址)")
+    @TableField("seller_sign_in_latitude_longitude_address")
+    private String sellerSignInLatitudeLongitudeAddress;
+
+    @ApiModelProperty(value = "取消交易的用户id")
+    @TableField("cancel_user_id")
+    private Integer cancelUserId;
+
+    @ApiModelProperty(value = "取消交易原因(字典表_cancelTradeReason)")
+    @TableField("cancel_reason")
+    private String cancelReason;
+
+    @ApiModelProperty(value = "取消交易原因补充")
+    @TableField("cancel_reason_supplement")
+    private String cancelReasonSupplement;
+
 
 }

alien-entity/src/main/java/shop/alien/mapper/second/SecondGoodsMapper.java

@@ -96,13 +96,14 @@ public interface SecondGoodsMapper extends BaseMapper<SecondGoods> {
      * @param queryWrapper 查询条件
      * @return 商品详情
      */
-    @Select("SELECT " + "sg.*, " + "sgc1.category_name as categoryOneName, "
+    @Select("SELECT " + "sg.*, "
+            + "sgc1.category_name as categoryOneName, "
             + "sgc2.category_name as categoryTwoName "
             + "FROM second_goods sg "
             + "left JOIN second_goods_category sgc1 "
             + "on sg.category_one_id = sgc1.id "
             + "left JOIN second_goods_category sgc2 "
-            + "on sg.category_two_id = sg.id " +
+            + "on sg.category_two_id = sgc2.id " +
             "${ew.customSqlSegment}")
     SecondGoodsVo getGoodsDetails(@Param(Constants.WRAPPER) QueryWrapper<SecondGoodsVo> queryWrapper);
 
@@ -254,20 +255,30 @@ public interface SecondGoodsMapper extends BaseMapper<SecondGoods> {
      * @return 交易中的商品列表
      */
     @Select("SELECT " +
-            "str.goods_id, " +
-            "    str.buyer_id, " +
-            "    str.seller_id, " +
-            "    str.transaction_time, " +
-            "    str.transaction_latitude_longitude, " +
-            "    str.transaction_location, " +
-            "    str.transaction_amount, " +
-            "    str.buyer_sign_in, " +
-            "    str.seller_sign_in, " +
-            "    str.buyer_transaction_status, " +
-            "    str.seller_transaction_status, " +
-            "    str.trade_status, " +
-            "    str.buyer_evaluate, " +
-            "    str.seller_evaluate,"+
+            "str.goods_id, " + // 商品id
+            "str.buyer_id, " + // 买家id
+            "str.seller_id, " + // 卖家id
+            "str.transaction_time, " + // 交易时间
+            "str.transaction_latitude_longitude, " + // 交易地点(经纬度)
+            "str.transaction_latitude_longitude_address, " + // 交易地点(经纬度地址)
+            "str.transaction_location, " + // 交易地点(详细地址)
+            "str.transaction_amount, " + // 交易金额
+            "str.buyer_sign_in, " + // 买家是否签到  0-未签到  1-已签到
+            "str.buyer_sign_in_time, " + // 买家签到时间
+            "str.buyer_sign_in_latitude_longitude, " + // 买家签到地点(经纬度)
+            "str.buyer_sign_in_latitude_longitude_address, " + // 买家签到地点(经纬度地址)
+            "str.seller_sign_in, " + // 卖家是否签到  0-未签到  1-已签到
+            "str.seller_sign_in_time, " + // 卖家签到时间
+            "str.seller_sign_in_latitude_longitude, " + // 卖家签到地点(经纬度)
+            "str.seller_sign_in_latitude_longitude_address, " + // 卖家签到地点(经纬度地址)
+            "str.buyer_transaction_status, " + // 买家交易状态  1-交易成功  2-交易失败
+            "str.seller_transaction_status, " + // 卖家交易状态  1-交易成功  2-交易失败
+            "str.trade_status, " + // 交易状态  1-待确认  2-已拒绝  3-待交易  4-交易成功  5-交易失败  6-交易取消
+            "str.buyer_evaluate, " + // 买家评价
+            "str.seller_evaluate, " + // 卖家评价
+            "str.cancel_user_id, " + // 取消交易id
+            "str.cancel_reason, " + // 取消交易原因
+            "str.cancel_reason_supplement, " + // 取消交易原因补充
             "sg.*, " +
             "    CASE " +
             "        WHEN str.buyer_id = #{userId} THEN str.seller_id " +

alien-second/src/main/java/shop/alien/second/controller/SecondShieldController.java

@@ -3,6 +3,7 @@ package shop.alien.second.controller;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiSort;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -10,6 +11,7 @@ import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.second.SecondShield;
+import shop.alien.entity.second.vo.SecondGoodsVo;
 import shop.alien.mapper.second.SecondShieldMapper;
 import shop.alien.util.common.JwtUtil;
 
@@ -60,15 +62,11 @@ public class SecondShieldController {
      * 取消拉黑
      */
     @PostMapping("/deleteGoodsShield")
-    public R<T> deleteGoodsShield(
-            @RequestParam(value = "id", required = false) Integer id) {
-        Integer num = mapper.deleteById(id);
-
-        if(num == 1) {
-            return R.success("取消拉黑成功");
-        }
-        return R.fail("取消拉黑失败");
-
+    @ApiOperation("取消拉黑")
+    public R<Void> deleteGoodsShield(@ApiParam("取消拉黑") @RequestBody SecondGoodsVo secondGoods) {
+        log.info("SecondShieldController.GoodsShield?secondGoods={}", secondGoods.toString());
+        mapper.deleteById(secondGoods.getShieldId());
+        return R.success("取消拉黑成功");
     }
 
 }

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsServiceImpl.java

@@ -297,10 +297,10 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
         lifeNotice.setSenderId("system");
         lifeNotice.setReceiverId("user_"+ phone);
         lifeNotice.setBusinessId(goods.getAuditRecordId());
-        lifeNotice.setTitle("商品发布通知");
+        lifeNotice.setTitle("商品审核通知");
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("status", "true");
-        jsonObject.put("message", "恭喜您的商品已发成功");
+        jsonObject.put("message", "恭喜您的商品已发布成功。");
         lifeNotice.setContext(jsonObject.toJSONString());
         lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
         lifeNotice.setIsRead(0);
@@ -326,7 +326,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("status", "false");
-        jsonObject.put("message", "抱歉您的商品发布失败，图片或文字存在违规行为。请您修改后从新发布");
+        jsonObject.put("message", "抱歉您的商品发布失败，图片或文字存在违规行为，请您修改后重新发布。");
         lifeNotice.setContext(jsonObject.toJSONString());
         lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
         lifeNotice.setIsRead(0);

alien-util/src/main/java/shop/alien/util/common/safe/ImageReviewServiceEnum.java

@@ -1,8 +1,11 @@
 package shop.alien.util.common.safe;
 
+import lombok.Getter;
+
 /**
  * 图片审核服务枚举
  */
+@Getter
 public enum ImageReviewServiceEnum {
 
     BASELINE_CHECK("baselineCheck", "通用基线检测", "检测图片中是否存在色情、涉政、暴恐、违禁等红线类的违规内容。", "通用场景"),
@@ -39,19 +42,4 @@ public enum ImageReviewServiceEnum {
     }
 
 
-    public String getService() {
-        return service;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public String getServiceDescription() {
-        return serviceDescription;
-    }
-
-    public String getServiceScene() {
-        return serviceScene;
-    }
 }

alien-util/src/main/java/shop/alien/util/common/safe/TextReviewServiceEnum.java

@@ -1,9 +1,12 @@
 package shop.alien.util.common.safe;
 
+import lombok.Getter;
+
 /**
  * @author: alien
  * @date: 2023/10/31
  */
+@Getter
 public enum TextReviewServiceEnum {
     UGC_MODERATION_BY_LLM("ugc_moderation_byllm", "UGC场景文本审核大模型服务", "针对UGC场景，基于大模型能力的文本审核服务，能够高效精准地识别违规内容。", "通用场景"),
     AIGC_MODERATION_BY_LLM("aigc_moderation_byllm", "AIGC场景文本审核大模型服务", "针对AIGC场景，基于大模型能力的文本审核服务，能够高效精准地识别违规内容。", "AIGC场景"),
@@ -38,19 +41,4 @@ public enum TextReviewServiceEnum {
         this.serviceScene = serviceScene;
     }
 
-    public String getService() {
-        return service;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public String getServiceDescription() {
-        return serviceDescription;
-    }
-
-    public String getServiceScene() {
-        return serviceScene;
-    }
 }