b2894lxlx/yunxinwei-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: b2894lxlx:1555fe1898f59ed2e43dbcf633641b8c393b8a30
Branches Tags
b2894lxlx:dev
...
compare: b2894lxlx:377a592195a597df127a5c27cb1d97d32c46f23f
Branches Tags
b2894lxlx:dev

2 Commits
1555fe1898 ... 377a592195

Author SHA1 Message Date
赵忠林
377a592195 refactor(certificate): 合并身份证正反面OCR识别接口 
- 移除旧的正面、反面单独识别接口，改用统一的身份证OCR合并识别接口
- 优化身份证OCR调用逻辑，添加图片base64转换失败处理
- 新增身份证识别服务实现，调用阿里云蜜堂有信接口
- 统一身份证照片识别失败错误码和提示，增强日志记录
- 验证身份证信息一致性及有效期，支持多格式日期解析
- 调整controller逻辑，使用新身份证OCR响应对象进行验证和回填
 2026-07-30 22:27:02 +08:00
赵忠林
8e081af4d8 fix(order): 续费时间无缝衔接，避免空窗期多送有效期 
- 续费时根据父订单到期时间判断，未逾期顺延，否则从当天延续一个月
- 后台统一计算续费开始与结束时间，不信任前端传入的时间参数
- 更新订单与续费记录的起始和结束时间逻辑，防止有效期重叠或空白
- 修改查询参数，支持仅查询续费单（rentOrderId 不为空）
- 保持支付状态和订单状态更新的正常流程，确保续费处理正确
 2026-07-27 11:36:51 +08:00
10 changed files with 196 additions and 149 deletions
Expand all files Collapse all files

24
src/main/java/com/gxwebsoft/love/controller/CertificateController.java
View File

@@ -13,9 +13,7 @@ import com.gxwebsoft.common.system.service.UserService;
import com.gxwebsoft.love.entity.Certificate;
import com.gxwebsoft.love.param.CertificateParam;
import com.gxwebsoft.love.service.CertificateService;
import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult;
import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
import com.gxwebsoft.love.vo.idcheck.Response;
import com.gxwebsoft.oa.vo.IdcardRespVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -97,26 +95,22 @@ public class CertificateController extends BaseController {
return fail("请上传身份证照片", certificate);
}
// 验证正面
Response<FrontRecognitionResult> front = certificateService.idcardfrontrecongnition(collect.get(0));
if (front.getError_code() != 0) {
return fail(front.getReason());
// 身份证OCR识别（正反面合并）
IdcardRespVO resp = certificateService.idcardOcr(collect.get(0), collect.get(1));
if (resp == null) {
return fail("身份证识别调用失败", certificate);
}
// 验证反面
Response<BackRecognitionResult> back = certificateService.idcardbackrecongnition(collect.get(1));
if (back.getError_code() != 0) {
return fail(back.getReason());
if (!"FP00000".equals(resp.getCode())) {
return fail(resp.getMessage() == null ? "身份证识别失败" : resp.getMessage(), certificate);
}
certificate.setStatus(30);
// 信息是否一致
if (!certificate.getCertificateCode().equals(front.getResult().getIdcardno())) {
if (!certificate.getCertificateCode().equals(resp.getIdCardNo())) {
return fail("认证失败", certificate);
}
if (!certificate.getRealName().equals(front.getResult().getName())) {
if (!certificate.getRealName().equals(resp.getName())) {
return fail("认证失败", certificate);
}
User user = new User();

17
src/main/java/com/gxwebsoft/love/service/CertificateService.java
View File

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.love.entity.Certificate;
import com.gxwebsoft.love.param.CertificateParam;
import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult;
import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
import com.gxwebsoft.love.vo.idcheck.Response;
import com.gxwebsoft.oa.vo.IdcardRespVO;
import java.util.List;
@@ -42,10 +40,15 @@ public interface CertificateService extends IService<Certificate> {
*/
Certificate getByIdRel(Integer certificateId);
/**
* 身份证OCR识别（正反面合并识别）
*
* @param frontImageUrl 正面图片 URL
* @param backImageUrl 反面图片 URL
* @return 识别结果
*/
IdcardRespVO idcardOcr(String frontImageUrl, String backImageUrl);
boolean verifyIdcard(Certificate param, List<String> files);
Response<FrontRecognitionResult> idcardfrontrecongnition(String imageUrl);
Response<BackRecognitionResult> idcardbackrecongnition(String imageUrl);
}

143
src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.gxwebsoft.love.service.impl;
import cn.hutool.core.exceptions.ExceptionUtil;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.common.core.utils.HttpUtils;
import com.gxwebsoft.common.core.utils.ImageUtil;
@@ -12,9 +11,7 @@ import com.gxwebsoft.love.entity.Certificate;
import com.gxwebsoft.love.mapper.CertificateMapper;
import com.gxwebsoft.love.param.CertificateParam;
import com.gxwebsoft.love.service.CertificateService;
import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult;
import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
import com.gxwebsoft.love.vo.idcheck.Response;
import com.gxwebsoft.oa.vo.IdcardRespVO;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
@@ -22,10 +19,12 @@ import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* 证件管理记录表Service实现
@@ -39,12 +38,13 @@ public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certi
@Resource
private RestTemplate restTemplate;
private String appcode = "566b5786c5874464909d8c0b7f64cdc7";
private static final String HOST = "https://miitangs14.market.alicloudapi.com";
private static final String APP_CODE = "1390018309a443c695c98c8da2bed691";
private static final String SUCCESS_CODE = "FP00000";
@Override
public PageResult<Certificate> pageRel(CertificateParam param) {
PageParam<Certificate, CertificateParam> page = new PageParam<>(param);
//page.setDefaultOrder("create_time desc");
List<Certificate> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -52,9 +52,7 @@ public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certi
@Override
public List<Certificate> listRel(CertificateParam param) {
List<Certificate> list = baseMapper.selectListRel(param);
// 排序
PageParam<Certificate, CertificateParam> page = new PageParam<>();
//page.setDefaultOrder("create_time desc");
return page.sortRecords(list);
}
@@ -65,94 +63,81 @@ public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certi
return param.getOne(baseMapper.selectListRel(param));
}
@Override
public IdcardRespVO idcardOcr(String frontImageUrl, String backImageUrl) {
String frontImg = ImageUtil.ImageBase64(frontImageUrl);
String backImg = ImageUtil.ImageBase64(backImageUrl);
if (frontImg == null || frontImg.isEmpty() || backImg == null || backImg.isEmpty()) {
IdcardRespVO fail = new IdcardRespVO();
fail.setCode("PARAM_ERROR");
fail.setMessage("身份证图片转base64失败");
return fail;
}
Map<String, String> headers = new HashMap<>();
headers.put("Authorization", "APPCODE " + APP_CODE);
headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
headers.put("X-Ca-Nonce", UUID.randomUUID().toString());
Map<String, String> querys = new HashMap<>();
Map<String, String> bodys = new HashMap<>();
bodys.put("reqNo", UUID.randomUUID().toString().replace("-", ""));
bodys.put("frontImg", frontImg);
bodys.put("backImg", backImg);
try {
HttpResponse response = HttpUtils.doPost(HOST, "/v1/tools/ocr/idCard", "POST", headers, querys, bodys);
HttpEntity entity = response.getEntity();
String string = EntityUtils.toString(entity);
return JSONObject.parseObject(string, IdcardRespVO.class);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
@Override
public boolean verifyIdcard(Certificate param, List<String> files) {
// 验证正面
Response<FrontRecognitionResult> front = idcardfrontrecongnition(files.get(0));
if(front.getError_code() != 0){
ExceptionUtil.wrapAndThrow(new Exception(front.getReason()));
if (files == null || files.size() < 2) {
ExceptionUtil.wrapAndThrow(new RuntimeException("缺少身份证正反面照片"));
return false;
}
// 验证反面
Response<BackRecognitionResult> back = idcardbackrecongnition(files.get(1));
if(back.getError_code() != 0){
ExceptionUtil.wrapAndThrow(new Exception(back.getReason()));
IdcardRespVO resp = idcardOcr(files.get(0), files.get(1));
if (resp == null) {
ExceptionUtil.wrapAndThrow(new RuntimeException("身份证识别调用失败"));
return false;
}
if (!SUCCESS_CODE.equals(resp.getCode())) {
ExceptionUtil.wrapAndThrow(new RuntimeException(resp.getMessage() == null ? "身份证识别失败" : resp.getMessage()));
return false;
}
// 信息是否一致
if(!param.getCertificateCode().equals(front.getResult().getIdcardno())){
if (!param.getCertificateCode().equals(resp.getIdCardNo())) {
return false;
}
if(!param.getRealName().equals(front.getResult().getName())){
if (!param.getRealName().equals(resp.getName())) {
return false;
}
boolean b = LocalDateTime.parse(back.getResult().getEndDate()).compareTo(LocalDateTime.now()) > 0;
return b;
// 有效期是否过期
String expireDate = resp.getExpireDate();
if (expireDate == null || expireDate.isEmpty()) {
return false;
}
@Override
public Response<FrontRecognitionResult> idcardfrontrecongnition(String imageUrl) {
String host = "https://zidv2.market.alicloudapi.com";
String path = "/thirdnode/ImageAI/idcardfrontrecongnition";
String method = "POST";
Map<String, String> headers = new HashMap<String, String>();
//最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
headers.put("Authorization", "APPCODE " + appcode);
//根据API的要求，定义相对应的Content-Type
headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
Map<String, String> querys = new HashMap<String, String>();
Map<String, String> bodys = new HashMap<String, String>();
bodys.put("base64Str", ImageUtil.ImageBase64(imageUrl));
LocalDate expire;
try {
HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
HttpEntity entity = response.getEntity();
String string = EntityUtils.toString(entity);
Response<FrontRecognitionResult> o = JSONObject.parseObject(string, new TypeReference<Response<FrontRecognitionResult>>() {
});
return o;
expire = LocalDate.parse(expireDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
@Override
public Response<BackRecognitionResult> idcardbackrecongnition(String imageUrl) {
String host = "https://zidv2.market.alicloudapi.com";
String path = "/thirdnode/ImageAI/idcardbackrecongnition";
String method = "POST";
Map<String, String> headers = new HashMap<String, String>();
//最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
headers.put("Authorization", "APPCODE " + appcode);
//根据API的要求，定义相对应的Content-Type
headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
Map<String, String> querys = new HashMap<String, String>();
Map<String, String> bodys = new HashMap<String, String>();
bodys.put("base64Str", ImageUtil.ImageBase64(imageUrl));
// 尝试按 yyyyMMdd 解析
try {
HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
HttpEntity entity = response.getEntity();
String string = EntityUtils.toString(entity);
Response<BackRecognitionResult> o = JSONObject.parseObject(string, new TypeReference<Response<BackRecognitionResult>>() {
});
return o;
} catch (Exception e) {
e.printStackTrace();
expire = LocalDate.parse(expireDate, DateTimeFormatter.ofPattern("yyyyMMdd"));
} catch (Exception ex) {
return false;
}
return null;
}
return expire.isAfter(LocalDate.now());
}
}

89
src/main/java/com/gxwebsoft/oa/service/impl/IdcardServiceImpl.java
View File

@@ -1,12 +1,10 @@
package com.gxwebsoft.oa.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference;
import com.gxwebsoft.common.core.utils.HttpUtils;
import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
import com.gxwebsoft.love.vo.idcheck.Response;
import com.gxwebsoft.oa.service.IdcardService;
import com.gxwebsoft.oa.vo.IdcardRespVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
@@ -16,42 +14,75 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@Slf4j
@Service
public class IdcardServiceImpl implements IdcardService {
/** 阿里云市场 - 身份证 OCR 供应商（蜜堂有信） */
private static final String HOST = "https://miitangs14.market.alicloudapi.com";
private static final String APP_CODE = "1390018309a443c695c98c8da2bed691";
private static final String SUCCESS_CODE = "FP00000";
/**
* @param frontImg 身份证正面图片的 base64 字符串（已带 ?x-oss-process 压缩，调用方负责生成）
* @param backImg 身份证反面图片的 base64 字符串
*/
@Override
public IdcardRespVO verify(String frontImg, String backImg) {
// 1. 校验输入
if (frontImg == null || frontImg.isEmpty() || backImg == null || backImg.isEmpty()) {
log.warn("身份证 verify 调用缺少正/反面图片, frontIsBlank={}, backIsBlank={}",
frontImg == null || frontImg.isEmpty(),
backImg == null || backImg.isEmpty());
return null;
}
String host = "https://miitangs14.market.alicloudapi.com";
String path = "/v1/tools/ocr/idCard";
String method = "POST";
String appcode = "1390018309a443c695c98c8da2bed691";
Map<String, String> headers = new HashMap<String, String>();
//最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
headers.put("Authorization", "APPCODE " + appcode);
//根据API的要求，定义相对应的Content-Type
// 2. 调用新接口（正反面合并为一次请求）
IdcardRespVO resp;
try {
resp = callOcr(frontImg, backImg);
} catch (Exception e) {
log.error("身份证OCR识别调用异常", e);
return null;
}
if (resp == null) {
log.warn("身份证OCR识别返回为空（接口无响应或解析失败）");
return null;
}
// 3. 失败返回具体原因
if (!SUCCESS_CODE.equals(resp.getCode())) {
log.warn("身份证OCR识别失败 code={}, message={}", resp.getCode(), resp.getMessage());
IdcardRespVO fail = new IdcardRespVO();
fail.setCode(resp.getCode());
fail.setMessage(resp.getMessage());
return fail;
}
// 4. 成功
log.info("身份证识别成功 name={}, idCardNo={}", resp.getName(), resp.getIdCardNo());
return resp;
}
/**
* 调用蜜堂有信身份证 OCR 接口：POST /v1/tools/ocr/idCard
*/
private IdcardRespVO callOcr(String frontImg, String backImg) throws Exception {
Map<String, String> headers = new HashMap<>();
headers.put("Authorization", "APPCODE " + APP_CODE);
headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
//需要给X-Ca-Nonce的值生成随机字符串，每次请求不能相同
headers.put("X-Ca-Nonce", UUID.randomUUID().toString());
Map<String, String> querys = new HashMap<String, String>();
Map<String, String> bodys = new HashMap<String, String>();
Map<String, String> querys = new HashMap<>();
Map<String, String> bodys = new HashMap<>();
bodys.put("reqNo", UUID.randomUUID().toString().replace("-", ""));
bodys.put("frontImg", frontImg);
bodys.put("backImg", backImg);
try {
HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
HttpResponse response = HttpUtils.doPost(HOST, "/v1/tools/ocr/idCard", "POST", headers, querys, bodys);
HttpEntity entity = response.getEntity();
String string = EntityUtils.toString(entity);
IdcardRespVO respVO = JSONObject.parseObject(string, new TypeReference<IdcardRespVO>() {
});
return respVO;
//获取response的body
//System.out.println(EntityUtils.toString(response.getEntity()));
} catch (Exception e) {
e.printStackTrace();
}
return null;
String body = EntityUtils.toString(entity);
log.debug("OCR 调用 frontImgLen={}, backImgLen={}, respLen={}", frontImg.length(), backImg.length(), body.length());
return JSONObject.parseObject(body, IdcardRespVO.class);
}
}

21
src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
View File

@@ -474,14 +474,21 @@ public class OpenEquipmentController extends BaseController {
return fail("身份证识别服务暂时不可用，请稍后重试");
}
if (verify == null) {
return fail("身份证识别失败，请稍后重试");
return fail("身份证识别服务调用失败，请稍后重试");
}
// 4. 正面校验：非 FP00000 说明传的不是有效身份证人像面
if (!"FP00000".equals(verify.getCode())) {
// 内部错误码仅记录日志，不回吐给用户
log.warn("身份证正面识别失败 code={}, message={}", verify.getCode(), verify.getMessage());
return fail("身份证正面照片识别失败，请重新上传清晰的身份证人像面照片");
// 优先用阿里云返回的具体原因，没拿到再回退到通用提示
String reason = verify.getMessage();
if ("FRONT_FAIL".equals(verify.getCode())) {
return fail(StrUtil.isNotBlank(reason) ? reason : "身份证正面照片识别失败，请重新上传清晰的身份证人像面照片");
}
if ("BACK_FAIL".equals(verify.getCode())) {
return fail(StrUtil.isNotBlank(reason) ? reason : "身份证反面照片识别失败，请重新上传清晰的身份证国徽面照片");
}
log.warn("身份证识别未通过 code={}, message={}", verify.getCode(), verify.getMessage());
return fail(StrUtil.isNotBlank(reason) ? reason : "身份证识别失败，请重新上传清晰的身份证照片");
}
// 5. 反面校验：签发机关/日期缺失说明传的不是有效身份证国徽面
@@ -491,6 +498,12 @@ public class OpenEquipmentController extends BaseController {
return fail("身份证反面照片识别失败，请重新上传清晰的身份证国徽面照片");
}
// 6. 正面字段也兜底校验一次（避免 OCR 返回空字符串导致回填出空实名）
if (StringUtils.isEmpty(verify.getName())
|| StringUtils.isEmpty(verify.getIdCardNo())) {
return fail("身份证正面照片识别失败，请重新上传清晰的身份证人像面照片");
}
// 6. 校验通过，回填实名信息
order.setRealName(verify.getName());
order.setIdCode(verify.getIdCardNo());

30
src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
View File

@@ -162,8 +162,12 @@ public class OrderPayController extends BaseController {
one.setCurrPeriods(order.getCurrPeriods() + 1);
one.setPeriods(order.getPeriods());
one.setRentOrderId(order.getOrderId());
one.setStartTime(order.getExpirationTime());
one.setExpirationTime(DateUtil.offset(order.getExpirationTime(), DateField.MONTH, 1));
// 续费无缝衔接：未逾期时从上一个到期日顺延一个月；已逾期时从今天顺延，
// 避免“旧到期日~续费当天”这段空窗期被白送（表现为下半月续费有效期多给一个月）
Date baseExpire = order.getExpirationTime();
Date renewStart = (baseExpire != null && baseExpire.after(new Date())) ? baseExpire : new Date();
one.setStartTime(renewStart);
one.setExpirationTime(DateUtil.offset(renewStart, DateField.MONTH, 1));
one.setPayStatus(PAY_STATUS_NO_PAY);
one.setBatteryDeposit(order.getBatteryDeposit());
one.setBatteryInsurance(order.getBatteryInsurance());
@@ -262,11 +266,19 @@ public class OrderPayController extends BaseController {
}
Order order = new Order();
order.setOrderId(orderPay.getRentOrderId());
order.setStartTime(orderPay.getStartTime());
order.setExpirationTime(orderPay.getExpirationTime());
orderService.updateById(order);
// 续费时间以父订单当前到期日为准无缝衔接，不信任前端传入的 startTime/expirationTime，
// 避免后台操作时把有效期算多一个月
Order parentOrder = orderService.getById(orderPay.getRentOrderId());
if (parentOrder == null) {
return fail("关联订单不存在");
}
Date parentExpire = parentOrder.getExpirationTime();
Date renewStart = (parentExpire != null && parentExpire.after(new Date())) ? parentExpire : new Date();
Date renewExpire = DateUtil.offset(renewStart, DateField.MONTH, 1);
parentOrder.setStartTime(renewStart);
parentOrder.setExpirationTime(renewExpire);
orderService.updateById(parentOrder);
OrderPay olderPay = orderPayService.getOne(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getOrderNo, orderPay.getOrderNo()));
OrderPay newOrderPay = new OrderPay();
@@ -274,10 +286,10 @@ public class OrderPayController extends BaseController {
newOrderPay.setOrderPrice(BigDecimal.valueOf(orderPay.getOrderPriceInt()));
newOrderPay.setStartTime(orderPay.getStartTime());
newOrderPay.setStartTime(renewStart);
newOrderPay.setPayTime(new Date());
newOrderPay.setCreateTime(new Date());
newOrderPay.setExpirationTime(orderPay.getExpirationTime());
newOrderPay.setExpirationTime(renewExpire);
newOrderPay.setOrderNo(IdUtil.getSnowflakeNextIdStr());
newOrderPay.setIsAdminRenew(1);//是否管理员续费订单

6
src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
View File

@@ -575,7 +575,9 @@ public class PaymentController extends BaseController {
}
Date expirationTime = parentOrder.getExpirationTime();
DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1);
// 逾期续费从今天衔接，避免“旧到期日~续费当天”空窗期白送一个月
Date renewBase = (expirationTime != null && expirationTime.after(new Date())) ? expirationTime : new Date();
DateTime nextMonthTime = DateUtil.offsetMonth(renewBase, 1);
parentOrder.setExpirationTime(nextMonthTime);
orderService.updateById(parentOrder);
// 保存续费订单状态
@@ -583,7 +585,7 @@ public class PaymentController extends BaseController {
d.setDeliveryStatus(DELIVERY_STATUS_ACCEPT);
d.setReceiptStatus(RECEIPT_STATUS_YES);
d.setOrderStatus(ORDER_STATUS_COMPLETED);
d.setStartTime(expirationTime);
d.setStartTime(renewBase);
d.setExpirationTime(nextMonthTime);
orderService.updateById(d);
}

3
src/main/java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml
View File

@@ -25,6 +25,9 @@
<if test="param.rentOrderId != null">
AND a.rent_order_id = #{param.rentOrderId}
</if>
<if test="param.rentOrderIdNotNull != null and param.rentOrderIdNotNull">
AND a.rent_order_id IS NOT NULL
</if>
<if test="param.payStatus != null">
AND a.pay_status = #{param.payStatus}
</if>

3
src/main/java/com/gxwebsoft/shop/param/OrderPayParam.java
View File

@@ -116,6 +116,9 @@ public class OrderPayParam extends BaseParam {
@QueryField(type = QueryType.EQ)
private Integer rentOrderId;
@ApiModelProperty(value = "仅查询续费单（rentOrderId 不为空）")
private Boolean rentOrderIdNotNull;
@ApiModelProperty(value = "电池租金")
@QueryField(type = QueryType.EQ)
private BigDecimal batteryRent;

7
src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java
View File

@@ -260,16 +260,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
// 主订单
Order parentOrder = orderService.getById(order.getRentOrderId());
parentOrder.setCurrPeriods(count + 1);
// 更新过期时间延长一个月
// 更新过期时间延长一个月（逾期时从今天衔接，避免空窗期白送）
Date expirationTime = parentOrder.getExpirationTime();
DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1);
Date renewBase = (expirationTime != null && expirationTime.after(new Date())) ? expirationTime : new Date();
DateTime nextMonthTime = DateUtil.offsetMonth(renewBase, 1);
parentOrder.setExpirationTime(nextMonthTime);
// 保存续费订单状态
// order.setDeliveryStatus(DELIVERY_STATUS_YES);
order.setDeliveryStatus(DELIVERY_STATUS_ACCEPT);
order.setReceiptStatus(RECEIPT_STATUS_YES);
order.setOrderStatus(ORDER_STATUS_COMPLETED);
order.setStartTime(expirationTime);
order.setStartTime(renewBase);
order.setExpirationTime(nextMonthTime);
try {