1.小程序钩子PartnerUserHolder;
提交状态
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
</select>
|
||||
<sql id="Base_Column_List">
|
||||
id,shop_id,audit_type,submitted_user_id,submitted_user_name,result_type,pass_reason,reject_reason,
|
||||
certify_file,create_time,update_time,deleted
|
||||
certify_file,create_time,update_time,deleted,data_type
|
||||
</sql>
|
||||
<select id="selectAuditIdByShopId" resultType="java.lang.Long">
|
||||
select
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.cool.store.request.LicenseListRequest;
|
||||
import com.cool.store.request.SubmitLicenseRequest;
|
||||
import com.cool.store.response.LicenseListResponse;
|
||||
import com.cool.store.response.SubmitLicenseResponse;
|
||||
import com.cool.store.vo.PartnerUserInfoVO;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
|
||||
public interface ApplyLicenseService {
|
||||
@@ -13,7 +14,7 @@ public interface ApplyLicenseService {
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
Boolean submitLicense(SubmitLicenseRequest request, LoginUserInfo user);
|
||||
Boolean submitLicense(SubmitLicenseRequest request, PartnerUserInfoVO user);
|
||||
|
||||
/**
|
||||
* 获取默认值
|
||||
|
||||
@@ -25,6 +25,7 @@ import com.cool.store.service.RegionService;
|
||||
import com.cool.store.utils.StringUtil;
|
||||
import com.cool.store.utils.poi.StringUtils;
|
||||
import com.cool.store.utils.poi.constant.Constants;
|
||||
import com.cool.store.vo.PartnerUserInfoVO;
|
||||
import com.cool.store.vo.ShopAuditInfoVO;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
@@ -79,7 +80,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean submitLicense(SubmitLicenseRequest request,LoginUserInfo user) {
|
||||
public Boolean submitLicense(SubmitLicenseRequest request, PartnerUserInfoVO user) {
|
||||
log.info("submitLicense request:{}", JSONObject.toJSONString(request));
|
||||
if (Objects.isNull(request)) {
|
||||
return false;
|
||||
@@ -95,8 +96,8 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
|
||||
ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO();
|
||||
shopAuditInfoDO.setShopId(request.getShopId());
|
||||
shopAuditInfoDO.setAuditType(AuditTypeEnum.LICENSE_APPROVAL.getCode());
|
||||
shopAuditInfoDO.setSubmittedUserId(user.getUserId());
|
||||
shopAuditInfoDO.setSubmittedUserName(user.getName());
|
||||
shopAuditInfoDO.setSubmittedUserId(user.getOpenid());
|
||||
shopAuditInfoDO.setSubmittedUserName(user.getUsername());
|
||||
shopAuditInfoDO.setDataType(0);
|
||||
shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
|
||||
shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_41, null);
|
||||
|
||||
@@ -2,11 +2,13 @@ package com.cool.store.controller.webc;
|
||||
|
||||
import com.cool.store.context.CurrentUserHolder;
|
||||
import com.cool.store.context.LoginUserInfo;
|
||||
import com.cool.store.context.PartnerUserHolder;
|
||||
import com.cool.store.request.SubmitLicenseRequest;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.response.SubmitLicenseResponse;
|
||||
import com.cool.store.service.ApplyLicenseService;
|
||||
import com.cool.store.service.CoolStoreStartFlowService;
|
||||
import com.cool.store.vo.PartnerUserInfoVO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -30,7 +32,7 @@ public class ApplyLicenseController {
|
||||
@ApiOperation("证照办理提交")
|
||||
@PostMapping("/submit")
|
||||
public ResponseResult submitLicense(@RequestBody SubmitLicenseRequest request) {
|
||||
LoginUserInfo user = CurrentUserHolder.getUser();
|
||||
PartnerUserInfoVO user = PartnerUserHolder.getUser();
|
||||
return ResponseResult.success(applyLicenseService.submitLicense(request,user));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user