diff --git a/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java b/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java index d47c058b..4b51678b 100644 --- a/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java +++ b/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java @@ -23,4 +23,6 @@ public class SeeYonProperties { private String url; + private String extApi; + } diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java index 5e7b0b00..3adfca2d 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java @@ -54,12 +54,12 @@ public class OmsShoppingCartApi { @GetMapping("/page") public R> getPage(OmsShoppingCart param){ BmsSupplier supplier = AuthContextUtils.getCurrentSupplier(); - WxUser wxUser = wxUserService.getCurrentWxUser(true); - if(wxUser==null){ + String sysUserId = AuthContextUtils.getSysUserId(); + if(sysUserId==null){ return R.byEmptyList(); } LambdaQueryWrapper shoppingCartWrapper = new LambdaQueryWrapper<>(param); - shoppingCartWrapper.eq(OmsShoppingCart::getUserId,wxUser.getSysUserId()); + shoppingCartWrapper.eq(OmsShoppingCart::getUserId,sysUserId); PageUtil.startPage(); List shoppingCarts = omsShoppingCartService.list(shoppingCartWrapper); omsShoppingCartService.checkShoppingCarts(supplier,shoppingCarts,false); @@ -91,8 +91,7 @@ public class OmsShoppingCartApi { public R save(@RequestBody @Valid OmsShoppingCartSaveBo param){ BmsSupplier supplier = AuthContextUtils.getCurrentSupplier(); OmsShoppingCart shoppingCart = CopierUtil.copy(param,new OmsShoppingCart()); - WxUser wxUser = wxUserService.getCurrentWxUser(true); - shoppingCart.setUserId(wxUser.getSysUserId()); + shoppingCart.setUserId(AuthContextUtils.getSysUserId()); GoodsSku goodsSku = goodsSkuService.getById(shoppingCart.getSkuId()); if(!goodsSku.getEnable().equals(1)){ return R.error("商品项["+goodsSku.getSpecInfos()+"]停用中"); diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 1d50f3f6..55158926 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; import com.google.gson.JsonArray; +import com.qs.serve.common.config.properties.SeeYonProperties; import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.model.annotation.SysLog; @@ -188,6 +189,7 @@ public class SysUserController { sysUser.setPassword(SecureUtil.md5(param.getNewPassword())); sysUser.setUpdateTime(LocalDateTime.now()); sysUserService.updateById(sysUser); + sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword()); return R.ok(); } @@ -207,6 +209,7 @@ public class SysUserController { sysUser.setPassword(SecureUtil.md5(param.getNewPassword())); sysUser.setUpdateTime(LocalDateTime.now()); sysUserService.updateById(sysUser); + sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword()); return R.ok(); } return R.error(); diff --git a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUpdateSeeYonPassword.java b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUpdateSeeYonPassword.java new file mode 100644 index 00000000..b8856c78 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUpdateSeeYonPassword.java @@ -0,0 +1,18 @@ +package com.qs.serve.modules.sys.entity.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @author YenHex + * @since 2023/8/31 + */ +@Data +@AllArgsConstructor +public class SysUpdateSeeYonPassword { + + String memberId; + + String password; + +} diff --git a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java index 9e837870..f59d7b0c 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java +++ b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java @@ -16,6 +16,7 @@ import java.util.List; */ public interface SysUserService extends IService { + void updateSeeYonPassword(String syUserId,String password); /** * 账号查询 diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java index c7fe65ea..8f4a4a0f 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.DesensitizedUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.config.properties.SeeYonProperties; import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.framework.security.model.LoginUserType; import com.qs.serve.common.model.enums.HttpCode; @@ -11,6 +12,7 @@ import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.entity.BmsRegionUser; import com.qs.serve.modules.sys.entity.*; import com.qs.serve.modules.sys.entity.bo.SysUserLeaveBo; +import com.qs.serve.modules.sys.entity.dto.SysUpdateSeeYonPassword; import com.qs.serve.modules.sys.mapper.*; import com.qs.serve.modules.sys.service.*; import lombok.AllArgsConstructor; @@ -44,7 +46,20 @@ public class SysUserServiceImpl extends ServiceImpl impl private final SysMenuMapper sysMenuMapper; private final SysPostMapper postMapper; private final SysPostUserMapper postUserMapper; + private SeeYonProperties seeYonProperties; + @Override + public void updateSeeYonPassword(String syUserId, String password) { + String apihost = seeYonProperties.getExtApi(); + if(StringUtils.hasText(syUserId)&&StringUtils.hasText(apihost)){ + String updateJson = JsonUtil.objectToJson(new SysUpdateSeeYonPassword(syUserId,password)); + try { + HttpUtil.doPost(apihost+"/api/oa/base/user/changePassword",updateJson,null); + } catch (Exception e) { + log.error(e.getMessage()); + } + } + } @Override public SysUser getByAccount(String acc) { diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index cfe0adf7..7ff7a5c7 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -102,6 +102,15 @@ public class VtbVerification implements Serializable { @TableField(condition = SqlCondition.LIKE) private String supplierName; + @TableField(condition = SqlCondition.LIKE) + private String supplierBizRegionFirstName; + + @TableField(condition = SqlCondition.LIKE) + private String supplierBizRegionSecondName; + + @TableField(condition = SqlCondition.LIKE) + private String supplierBizRegionThirdName; + /** 支付方式id */ private Long wayId; diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java index 31dc8240..eecb9fd8 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java @@ -62,5 +62,14 @@ public class VtbVerificationSo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime queryEndTime; + @TableField(condition = SqlCondition.LIKE) + private String supplierBizRegionFirstName; + + @TableField(condition = SqlCondition.LIKE) + private String supplierBizRegionSecondName; + + @TableField(condition = SqlCondition.LIKE) + private String supplierBizRegionThirdName; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 56284ef3..1edba1fd 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -632,6 +632,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl channelBoList = verificationBo.getChannelList(); List pointBoList = verificationBo.getPointList(); List vtbVerificationChannelList = new ArrayList<>(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7523290d..df2ecea1 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -8,6 +8,8 @@ project: seeyon: enable: true url: 'http://192.168.0.9:7444' + #请求致远OA的拓展服务（用于修改密码） + extApi: 'http://192.168.10.244:9003/' upload: #上传映射地址