Merge branch 'master' of http://115.29.66.169:10080/yiyao_shop/api

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

@@ -145,7 +145,6 @@ public class BusinessDayBillController extends BaseController {
     @SaCheckPermission("businessDayBill:businessDayBill:getStatistics")
     @GetMapping("/getStatistics")
     public R<BusinessDayBillVo> getStatistics(@Validated BusinessDayBillCountBo bo) {
-        bo.setBusinessId(getBusinessId( true));
         return R.ok(iBusinessDayBillService.getStatistics(bo));
     }
 

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

@@ -0,0 +1,44 @@
+package com.ruoyi.web.controller.shop.business;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.business.domain.vo.BusinessSettlementVo;
+import com.ruoyi.business.service.IBusinessSettlementService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 商家结算信息Controller
+ *
+ * @author ruoyi
+ * @date 2025-12-11
+ */
+@Validated
+@Api(value = "商家结算信息控制器", tags = {"商家结算信息管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/business/businessSettlement")
+public class BusinessSettlementController extends BaseController {
+
+    private final IBusinessSettlementService iBusinessSettlementService;
+
+    /**
+     * 获取商家结算信息详细信息
+     */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @ApiOperation("获取商家结算信息详细信息")
+    @SaCheckPermission("business:businessSettlement:query")
+    @GetMapping("/info")
+    public R<BusinessSettlementVo> getInfo() {
+        return R.ok(iBusinessSettlementService.queryByBusinessId(getBusinessId(true)));
+    }
+
+}

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

@@ -179,15 +179,9 @@ public class AgentServiceImpl implements IAgentService {
         String inviteCode = ShareCodeUtils.idToCode(Long.parseLong(add.getPhone()));
         add.setInviteCode(InviteType.AGENT.getCode() + inviteCode);
         //签合同
-        Boolean signFlag = jzqService.uploadPersSign(bo.getIdCard(), bo.getSignImage());
-        if(!signFlag){
-            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_FAIL);
-        }
+        jzqService.uploadPersSign(bo.getIdCard(), bo.getSignImage());
         //个人先认证
-        Boolean certiFlag = jzqService.cloudCertiPerInfo(add.getRealName(), add.getIdCard(), bo.getIdCardFrontUrl(), bo.getIdCardBackUrl());
-        if(!certiFlag){
-            throw new ServiceException(AgentExceptionEnum.Agent_SIGN_CONTRACT_FAIL);
-        }
+        jzqService.cloudCertiPerInfo(add.getRealName(), add.getIdCard(), bo.getIdCardFrontUrl(), bo.getIdCardBackUrl());
         String contractNo = jzqService.applySign(buildSignatories(add));
         if (StringUtils.isEmpty(contractNo)) {
             throw new ServiceException(AgentExceptionEnum.Agent_SIGN_CONTRACT_FAIL);

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

@@ -263,15 +263,9 @@ public class BusinessServiceImpl implements IBusinessService {
         //到期时间 1年后到期
         add.setExpiresTime(DateUtils.addYears(new Date(), 1));
         //签合同
-        Boolean signFlag = jzqService.uploadPersSign(bo.getLegalIdCard(), bo.getSignImage());
-        if(!signFlag){
-            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_FAIL);
-        }
+        jzqService.uploadPersSign(bo.getLegalIdCard(), bo.getSignImage());
         //个人先认证
-        Boolean certiFlag = jzqService.cloudCertiPerInfo(add.getLegalName(), add.getLegalIdCard(), bo.getLegalIdCardFrontUrl(), bo.getLegalIdCardBackUrl());
-        if(!certiFlag){
-            throw new ServiceException(BusinessExceptionEnum.Business_SIGN_CONTRACT_FAIL);
-        }
+        jzqService.cloudCertiPerInfo(add.getLegalName(), add.getLegalIdCard(), bo.getLegalIdCardFrontUrl(), bo.getLegalIdCardBackUrl());
         String contractNo = jzqService.applySign(buildSignatories(add));
         if (StringUtils.isEmpty(contractNo)) {
             throw new ServiceException(BusinessExceptionEnum.Business_SIGN_CONTRACT_FAIL);

ruoyi-tool/src/main/java/com/ruoyi/tool/service/JzqService.java

@@ -3,6 +3,7 @@ package com.ruoyi.tool.service;
 import com.alibaba.fastjson.JSONObject;
 import com.junziqian.sdk.bean.ResultInfo;
 import com.junziqian.sdk.util.RequestUtils;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.filepathsplicing.FilePathSplicingUtil;
 import com.ruoyi.tool.config.JzqProperties;
 import com.ruoyi.tool.request.OcrRequest;
@@ -28,7 +29,7 @@ public class JzqService {
     /**
      * 上传个人自定义印章图片
      */
-    public Boolean uploadPersSign(String identityCard, String signImgFile) {
+    public void uploadPersSign(String identityCard, String signImgFile) {
         RequestUtils requestUtils = RequestUtils.init(jzqProperties.getBaseUrl(), jzqProperties.getAppKey(), jzqProperties.getAppSecret());
         //构建请求参数
         Map<String, Object> params = new HashMap<>();
@@ -36,13 +37,15 @@ public class JzqService {
         params.put("signImgFile", filePathSplicingUtil.getPrefix() + signImgFile);
         ResultInfo<Void> ri = requestUtils.doPost(jzqProperties.getUploadPersSign(), params);
         log.info("上传个人自定义印章图片：{}", ri.getMsg());
-        return ri.isSuccess();
+        if (!ri.isSuccess()) {
+            throw new ServiceException("操作失败：" + ri.getMsg());
+        }
     }
 
     /**
      * 个人证书申请资料上传
      */
-    public Boolean cloudCertiPerInfo(String fullName, String identityCard, String idenFront, String idenReverse) {
+    public void cloudCertiPerInfo(String fullName, String identityCard, String idenFront, String idenReverse) {
         RequestUtils requestUtils = RequestUtils.init(jzqProperties.getBaseUrl(), jzqProperties.getAppKey(), jzqProperties.getAppSecret());
         //构建请求参数
         Map<String, Object> params = new HashMap<>();
@@ -52,7 +55,9 @@ public class JzqService {
         params.put("idenReverse", filePathSplicingUtil.getPrefix() + idenReverse);
         ResultInfo<String> ri = requestUtils.doPost(jzqProperties.getCloudCertiPerInfo(), params);
         log.info("个人证书申请资料上传：{}", ri.getMsg());
-        return ri.isSuccess();
+        if (!ri.isSuccess()) {
+            throw new ServiceException("操作失败：" + ri.getMsg());
+        }
     }
 
     /**
@@ -64,8 +69,9 @@ public class JzqService {
         log.info("签约发起-模板类API：{}", ri.getMsg());
         if (ri.isSuccess()) {
             return ri.getData();
+        } else {
+            throw new ServiceException("操作失败：" + ri.getMsg());
         }
-        return null;
     }
 
     /**

ruoyi-user/src/main/java/com/ruoyi/user/domain/bo/UserLoginBo.java

@@ -37,4 +37,9 @@ public class UserLoginBo implements Serializable {
      */
     @ApiModelProperty(value = "1-商城小程序 2-微信支付小程序 3-支付宝支付小程序 4-app")
     private Integer clientType;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
 }

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

@@ -488,6 +488,7 @@ public class UserServiceImpl implements IUserService {
         //登录或注册
         WxUserDto wxUserDto = new WxUserDto();
         wxUserDto.setMobile(bo.getMobile());
+        wxUserDto.setNickname(bo.getNickname());
         User user = registerOrLogin(wxUserDto, null, null);
 
         UserLoginVo userLoginVo = new UserLoginVo();