商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessDayBillController.java

@@ -90,7 +90,7 @@ public class BusinessDayBillController extends BaseController {
     @ApiOperation("平台导出商家日账单列表")
     @SaCheckPermission("businessDayBill:businessDayBill:export")
     @Log(title = "在线订单", businessType = BusinessType.EXPORT)
-    @PostMapping("/账单列表")
+    @PostMapping("/export")
     public void export(@Validated BusinessDayBillBo bo, HttpServletResponse response) {
         List<BusinessDayBillVo> list = iBusinessDayBillService.queryList(bo);
         ExcelUtil.exportExcel(list, "账单列表", BusinessDayBillVo.class, response);

ruoyi-api/src/main/java/com/ruoyi/api/controller/business/ApiBusinessDayBillController.java

@@ -18,13 +18,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -73,7 +69,7 @@ public class ApiBusinessDayBillController extends AbstractApiController {
      */
     @ApiOperation("导出商家日账单列表")
     @PostMapping("/export")
-    public void export(@Validated BusinessDayBillBo bo, HttpServletResponse response) {
+    public void export(@Validated @RequestBody BusinessDayBillBo bo, HttpServletResponse response) {
         if (ObjectUtil.isNull(bo.getBusinessId())) {
             bo.setBusinessId(getBusinessByUserId(getUserId(true), true));
         }

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentServiceImpl.java

@@ -178,21 +178,21 @@ public class AgentServiceImpl implements IAgentService {
         //生成邀请码
         String inviteCode = ShareCodeUtils.idToCode(Long.parseLong(add.getPhone()));
         add.setInviteCode(InviteType.AGENT.getCode() + inviteCode);
-        //签合同 TODO
-//        Boolean signFlag = jzqService.uploadPersSign(bo.getIdCard(), bo.getSignImage());
-//        if(!signFlag){
-//            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_FAIL);
-//        }
-//        //个人先认证
-//        Boolean certiFlag = jzqService.cloudCertiPerInfo(add.getRealName(), add.getIdCard(), bo.getIdCardFrontUrl(), bo.getIdCardBackUrl());
-//        if(!certiFlag){
-//            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_CONTRACT_FAIL);
-//        }
-//        String contractNo = jzqService.applySign(buildSignatories(add));
-//        if (StringUtils.isEmpty(contractNo)) {
-//            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_CONTRACT_FAIL);
-//        }
-//        add.setContractNo(contractNo);
+        //签合同
+        Boolean signFlag = jzqService.uploadPersSign(bo.getIdCard(), bo.getSignImage());
+        if(!signFlag){
+            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_FAIL);
+        }
+        //个人先认证
+        Boolean certiFlag = jzqService.cloudCertiPerInfo(add.getRealName(), add.getIdCard(), bo.getIdCardFrontUrl(), bo.getIdCardBackUrl());
+        if(!certiFlag){
+            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_CONTRACT_FAIL);
+        }
+        String contractNo = jzqService.applySign(buildSignatories(add));
+        if (StringUtils.isEmpty(contractNo)) {
+            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_CONTRACT_FAIL);
+        }
+        add.setContractNo(contractNo);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setAgentId(add.getAgentId());

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -262,21 +262,21 @@ public class BusinessServiceImpl implements IBusinessService {
         add.setBusinessStatus(true);
         //到期时间 1年后到期
         add.setExpiresTime(DateUtils.addYears(new Date(), 1));
-        //签合同 TODO
-//        Boolean signFlag = jzqService.uploadPersSign(bo.getLegalIdCard(), bo.getSignImage());
-//        if(!signFlag){
-//            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_FAIL);
-//        }
-//        //个人先认证
-//        Boolean certiFlag = jzqService.cloudCertiPerInfo(add.getLegalName(), add.getLegalIdCard(), bo.getLegalIdCardFrontUrl(), bo.getLegalIdCardBackUrl());
-//        if(!certiFlag){
-//            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_CONTRACT_FAIL);
-//        }
-//        String contractNo = jzqService.applySign(buildSignatories(add));
-//        if (StringUtils.isEmpty(contractNo)) {
-//            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_CONTRACT_FAIL);
-//        }
-//        add.setContractNo(contractNo);
+        //签合同
+        Boolean signFlag = jzqService.uploadPersSign(bo.getLegalIdCard(), bo.getSignImage());
+        if(!signFlag){
+            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_FAIL);
+        }
+        //个人先认证
+        Boolean certiFlag = jzqService.cloudCertiPerInfo(add.getLegalName(), add.getLegalIdCard(), bo.getLegalIdCardFrontUrl(), bo.getLegalIdCardBackUrl());
+        if(!certiFlag){
+            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_CONTRACT_FAIL);
+        }
+        String contractNo = jzqService.applySign(buildSignatories(add));
+        if (StringUtils.isEmpty(contractNo)) {
+            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_CONTRACT_FAIL);
+        }
+        add.setContractNo(contractNo);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             //生成邀请码

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/bo/BusinessDayBillBo.java

@@ -1,22 +1,18 @@
 package com.ruoyi.businessDayBill.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
+import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
-
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 商家日账单业务对象 tb_business_day_bill
@@ -26,6 +22,8 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @Builder
 @Data
+@NoArgsConstructor  // 关键修复：强制生成无参构造
+@AllArgsConstructor  // 保留全参构造（与@Builder兼容）
 @EqualsAndHashCode
 @ApiModel("商家日账单业务对象")
 public class BusinessDayBillBo implements Serializable {

ruoyi-user/src/main/java/com/ruoyi/user/exception/UserExceptionEnum.java

@@ -15,7 +15,8 @@ public enum UserExceptionEnum implements IIntegerEnum {
     MOBILE_USER_EXIST(100012, "手机号用户已存在！"),
     USER_INVITATION_CODE_REPEAT(100013, "用户邀请码重复！"),
     USER_INVITATION_CODE_NOT_EXIST(100014, "用户邀请码不存在！"),
-    USER_MOBILE_REPEAT(100015, "手机号已存在！");
+    USER_MOBILE_REPEAT(100015, "手机号已存在！"),
+    MOBILE_USER_NOT_EXIST(100016, "手机号用户不存在！");
 
     private Integer code;
 

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -329,8 +329,8 @@ public class UserServiceImpl implements IUserService {
     @Override
     public User loadByMobile(String mobile, Boolean tw) {
         User user = this.baseMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getMobile, mobile).last("limit 1"));
-        if (tw && ObjectUtil.isNotNull(user)) {
-            throw new ServiceException(UserExceptionEnum.MOBILE_USER_EXIST);
+        if (tw && ObjectUtil.isNull(user)) {
+            throw new ServiceException(UserExceptionEnum.MOBILE_USER_NOT_EXIST);
         }
         return user;
     }