1. 生活服务权益兑换车险

2. 权益积分显示bug

src/main/java/com/ydtech/modules/equity/components/EquityRequestApiComponents.java

@@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.equity.model.request.*;
-import com.ydtech.modules.equity.model.response.BaseResponse;
-import com.ydtech.modules.equity.model.response.LocalEquityPackagePage;
-import com.ydtech.modules.equity.model.response.PageResultResponse;
-import com.ydtech.modules.equity.model.response.PointRatioDto;
+import com.ydtech.modules.equity.model.response.*;
+import com.ydtech.modules.equity.model.request.OrderveRificationRightInfoVo;
+import com.ydtech.modules.equity.model.vo.RightInfoQueryVo;
 import com.ydtech.modules.equity.utils.SMCheckDataUtils;
 import com.ydtech.modules.order.utils.InsuranceLog;
 import com.ydtech.utils.HttpUtil;
@@ -17,7 +16,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -129,4 +127,28 @@ public class EquityRequestApiComponents {
             return null;
         }
     }
+
+    /**
+     * 获取权益列表
+     * @param rightInfoQueryVo
+     * @return
+     */
+    public RightInfoResultResponse findListByPhoneAndLicenseNo(RightInfoQueryVo rightInfoQueryVo){
+
+        RightInfoResultResponse response = request(properties.getUrl(), "findListByPhoneAndLicenseNo"
+                ,rightInfoQueryVo , RightInfoResultResponse.class);
+        RightInfoResultResponse res = JSON.parseObject(response.getResult()).toJavaObject(RightInfoResultResponse.class);
+        return res;
+    }
+
+    /**
+     * 保单核销权益卷接口
+     * @param orderveRificationRightInfoVo
+     * @return
+     */
+    public BaseResponse orderveRificationRightInfo(OrderveRificationRightInfoVo orderveRificationRightInfoVo){
+        BaseResponse response = request(properties.getUrl(), "orderveRificationRightInfo"
+                ,orderveRificationRightInfoVo , BaseResponse.class);
+        return response;
+    }
 }

src/main/java/com/ydtech/modules/equity/controller/EquityController.java

@@ -9,10 +9,12 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.customer.entity.vo.ReturnMessageVo;
 import com.ydtech.modules.equity.model.InsAreaCompanyEquity;
+import com.ydtech.modules.equity.model.request.OrderveRificationRightInfoVo;
 import com.ydtech.modules.equity.model.response.LocalEquityPackagePage;
 import com.ydtech.modules.equity.model.vo.AddEquityPageQueryVo;
 import com.ydtech.modules.equity.model.vo.EquityPageQueryVo;
 import com.ydtech.modules.equity.model.vo.EquitySaveVo;
+import com.ydtech.modules.equity.model.vo.RightInfoQueryVo;
 import com.ydtech.modules.equity.service.EquityService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
@@ -122,5 +124,24 @@ public class EquityController  extends BaseController {
         return HttpResult.ok();
     }
 
+    /**
+     * 获取权益列表
+     * @param rightInfoQueryVo
+     * @return
+     */
+    @PostMapping("/findListByPhoneAndLicenseNo")
+    public HttpResult findListByPhoneAndLicenseNo(@Validated @RequestBody RightInfoQueryVo rightInfoQueryVo) {
+        return HttpResult.ok(equityService.findListByPhoneAndLicenseNo(rightInfoQueryVo));
+    }
+
+    /**
+     * 提交权益信息
+     * @param orderveRificationRightInfoVo
+     * @return
+     */
+    @PostMapping("/orderveRificationRightInfo")
+    public HttpResult orderveRificationRightInfo(@Validated @RequestBody OrderveRificationRightInfoVo orderveRificationRightInfoVo){
+        return HttpResult.ok(equityService.orderveRificationRightInfo(orderveRificationRightInfoVo));
+    }
 
 }

src/main/java/com/ydtech/modules/equity/model/request/OrderveRificationRightInfoVo.java

@@ -0,0 +1,34 @@
+package com.ydtech.modules.equity.model.request;
+
+
+import com.ydtech.modules.equity.model.request.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/7/22 16:20
+ *  @Description: 下单核销对象
+ */
+@Data
+public class OrderveRificationRightInfoVo extends BaseRequest {
+
+    @ApiModelProperty(value = "子订单号")
+    private String subOrderNo;
+
+    @ApiModelProperty(value = "保单总保费")
+    private BigDecimal sumPremium;
+
+    @ApiModelProperty(value = "关联权益卷id")
+    private String localRightsUserInfoId;
+
+    @ApiModelProperty(value = "核销人工号")
+    private String writeOffUserId;
+
+    @ApiModelProperty(value = "核销人名称")
+    private String writeOffUserName;
+
+}

src/main/java/com/ydtech/modules/equity/model/response/RightInfoDto.java

@@ -0,0 +1,66 @@
+package com.ydtech.modules.equity.model.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RightInfoDto extends BaseResponse {
+
+    @ApiModelProperty(value = "用户关联权益卷id")
+    private String localRightsUserInfoId;
+
+
+    @ApiModelProperty(value = "权益卷名称")
+    private String localRightsUserInfoName;
+
+    @ApiModelProperty(value = "分类Id")
+    private String classifyId;
+
+    @ApiModelProperty(value = "分类名称")
+    private String classifyName;
+
+    @ApiModelProperty(value = "状态（0：未使用 1：已使用 3.待领取4.已失效）")
+    private String status;
+
+    @ApiModelProperty(value = "状态值")
+    private String statusName;
+    /**
+     * 兑换人
+     */
+    @ApiModelProperty(value = "姓名")
+    private String exchangeName;
+
+    @ApiModelProperty(value = "电话")
+    private String exchangePhone;
+
+
+    @ApiModelProperty(value = "申请兑现时间")
+    private String exchangeTime;
+
+
+    @ApiModelProperty(value = "兑换状态 0 未兑换  1已兑换  ")
+    private String exchangeStatus;
+
+    @ApiModelProperty(value = "兑换状态名称")
+    private String exchangeStatusName;
+
+    @ApiModelProperty(value = "兑换订单号")
+    private String exchangeSubOrderNo;
+
+    @ApiModelProperty(value = "操作（兑换）时间")
+    private String oprationDate;
+
+    @ApiModelProperty(value = "操作人")
+    private String writeOffUserName;
+
+
+    @ApiModelProperty(value = "有效期开始时间")
+    private String periodValidityBeginDate;
+
+    @ApiModelProperty(value = "有效期结束时间")
+    private String periodValidityEndDate;
+
+
+    @ApiModelProperty(value = "使用有限期类型（1.用户领取后生效2.三方用户赠送时间起3.固定时间段4.长期可用）")
+    private String useType;
+}

src/main/java/com/ydtech/modules/equity/model/response/RightInfoResultResponse.java

@@ -0,0 +1,24 @@
+package com.ydtech.modules.equity.model.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class RightInfoResultResponse extends BaseResponse {
+
+    @JsonProperty("records")
+    public List<RightInfoDto> records;
+
+    @JsonProperty("total")
+    public int total;
+
+    @JsonProperty("pages")
+    public int pages;
+
+    @JsonProperty("size")
+    public int size;
+}

src/main/java/com/ydtech/modules/equity/model/vo/RightInfoQueryVo.java

@@ -0,0 +1,44 @@
+package com.ydtech.modules.equity.model.vo;
+
+import com.ydtech.modules.equity.model.request.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RightInfoQueryVo extends BaseRequest {
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "页数")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "有效期开始时间")
+    private String periodValidityBeginDate;
+
+    @ApiModelProperty(value = "有效期结束时间")
+    private String periodValidityEndDate;
+
+    @ApiModelProperty(value = "权益状态")
+    private String status;
+
+    @ApiModelProperty(value = "兑换状态")
+    private String exchangeStatus;
+
+    @ApiModelProperty(value = "操作开始时间")
+    private String oprationBeginDate;
+
+    @ApiModelProperty(value = "操作结束时间")
+    private String oprationEndDate;
+
+    @ApiModelProperty(value = "操作人")
+    private String oprationName;
+
+}

src/main/java/com/ydtech/modules/equity/service/EquityService.java

@@ -2,9 +2,13 @@ package com.ydtech.modules.equity.service;
 
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.equity.model.InsAreaCompanyEquity;
+import com.ydtech.modules.equity.model.request.OrderveRificationRightInfoVo;
+import com.ydtech.modules.equity.model.response.BaseResponse;
+import com.ydtech.modules.equity.model.response.RightInfoResultResponse;
 import com.ydtech.modules.equity.model.vo.AddEquityPageQueryVo;
 import com.ydtech.modules.equity.model.vo.EquityPageQueryVo;
 import com.ydtech.modules.equity.model.vo.EquitySaveVo;
+import com.ydtech.modules.equity.model.vo.RightInfoQueryVo;
 
 public interface EquityService {
 
@@ -67,4 +71,18 @@ public interface EquityService {
      * @return
      */
     InsAreaCompanyEquity queryEquityInfo(String companyId);
+
+    /**
+     * 获取权益列表
+     * @param rightInfoQueryVo
+     * @return
+     */
+    RightInfoResultResponse findListByPhoneAndLicenseNo(RightInfoQueryVo rightInfoQueryVo);
+
+    /**
+     * 9.保单核销权益卷接口
+     * @param orderveRificationRightInfoVo
+     * @return
+     */
+    BaseResponse orderveRificationRightInfo(OrderveRificationRightInfoVo orderveRificationRightInfoVo);
 }

src/main/java/com/ydtech/modules/equity/service/impl/EquityServiceImpl.java

@@ -6,16 +6,16 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.equity.components.EquityApiConfigurationProperties;
 import com.ydtech.modules.equity.components.EquityRequestApiComponents;
 import com.ydtech.modules.equity.model.InsAreaCompanyEquity;
 import com.ydtech.modules.equity.model.request.*;
-import com.ydtech.modules.equity.model.response.LocalEquityPackagePage;
-import com.ydtech.modules.equity.model.response.PageResultResponse;
-import com.ydtech.modules.equity.model.response.PointRatioDto;
+import com.ydtech.modules.equity.model.response.*;
 import com.ydtech.modules.equity.model.vo.AddEquityPageQueryVo;
 import com.ydtech.modules.equity.model.vo.EquityPageQueryVo;
 import com.ydtech.modules.equity.model.vo.EquitySaveVo;
+import com.ydtech.modules.equity.model.vo.RightInfoQueryVo;
 import com.ydtech.modules.equity.service.EquityService;
 import com.ydtech.modules.equity.service.InsAreaCompanyEquityService;
 import com.ydtech.modules.order.constants.BusinessConstant;
@@ -102,6 +102,26 @@ public class EquityServiceImpl implements EquityService {
         return equity;
     }
 
+    @Override
+    public RightInfoResultResponse findListByPhoneAndLicenseNo(RightInfoQueryVo rightInfoQueryVo) {
+        RightInfoResultResponse listByPhoneAndLicenseNo = equityRequestApiComponents.findListByPhoneAndLicenseNo(rightInfoQueryVo);
+        return listByPhoneAndLicenseNo;
+    }
+
+    @Override
+    public BaseResponse orderveRificationRightInfo(OrderveRificationRightInfoVo orderveRificationRightInfoVo) {
+        // 查询订单金额
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(orderveRificationRightInfoVo.getSubOrderNo());
+        if (Objects.isNull(insAreaCompany)){
+            throw new SystemException("订单不存在！");
+        }
+        orderveRificationRightInfoVo.setSumPremium(insAreaCompany.getSumpremium());
+        orderveRificationRightInfoVo.setWriteOffUserId(BaseController.getUserId());
+        orderveRificationRightInfoVo.setWriteOffUserName(BaseController.getUser().getName());
+        BaseResponse baseResponse = equityRequestApiComponents.orderveRificationRightInfo(orderveRificationRightInfoVo);
+        return baseResponse;
+    }
+
     @Override
     public EquityPageQueryVo equityInfo(EquityPageQueryVo pageQueryVo) {
 
@@ -128,6 +148,7 @@ public class EquityServiceImpl implements EquityService {
                 totalAmount = fee.getTotalAmount();
             }
         }
+        pageQueryVo.setAmount(totalAmount);
         int pageNum = pageQueryVo.getPageNum();
         int pageSize = pageQueryVo.getPageSize();
         PageResult pageResult = new PageResult();