zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zjf committed 2025-05-23 16:50:12 +08:00
2 parents e8725d0f98 8314f51dc5
commit 57ee976fc8
4 files changed
+13 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java
+6 -6
View File
@@ -113,10 +113,10 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
if (ObjectUtil.equals(entity.getIsDefault(), YesNoEnum.NO.getCode())) {
return entity.getId();
}
if (ObjectUtil.isEmpty(entity.getKsSkuId())) {
getSelf().submitKsSpu(spuDetail);
}
if (ObjectUtil.notEqual(spuDetail.getStatus(), HardKsCheckStatusEnum.CHECK_DONE.getType())) {
if (ObjectUtil.notEqual(spuDetail.getKsStatus(), HardKsCheckStatusEnum.CHECK_DONE.getType())) {
if (ObjectUtil.isEmpty(entity.getKsSkuId())) {
getSelf().submitKsSpu(spuDetail);
}
getSelf().editKsSpu(spuDetail);
}
return entity.getId();
@@ -473,7 +473,7 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
@Transactional(rollbackFor = Exception.class)
public void submitKsSpu(HardSpuEntity entity) {
String pic = entity.getPic();
pic = "https://nasa-voyager.oss-cn-beijing.aliyuncs.com/release/merchant_sku_img/watermark/202412021517-173bee3f2637499cb6b46e9b23d286c5.jpg";
// pic = "https://nasa-voyager.oss-cn-beijing.aliyuncs.com/release/merchant_sku_img/watermark/202412021517-173bee3f2637499cb6b46e9b23d286c5.jpg";
List<String> picList = Arrays.asList(pic.split(","));
String imageBaseUrl = ParamResolver.getStr("IMAGE_BASE_URL");
if (ObjectUtil.isEmpty(imageBaseUrl)) throw new RuntimeException("请配置图片基础路径");
@@ -509,7 +509,7 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
@Transactional(rollbackFor = Exception.class)
public void editKsSpu(HardSpuEntity entity) {
String pic = entity.getPic();
pic = "https://nasa-voyager.oss-cn-beijing.aliyuncs.com/release/merchant_sku_img/watermark/202412021517-173bee3f2637499cb6b46e9b23d286c5.jpg";
// pic = "https://nasa-voyager.oss-cn-beijing.aliyuncs.com/release/merchant_sku_img/watermark/202412021517-173bee3f2637499cb6b46e9b23d286c5.jpg";
List<String> picList = Arrays.asList(pic.split(","));
String imageBaseUrl = ParamResolver.getStr("IMAGE_BASE_URL");
if (ObjectUtil.isEmpty(imageBaseUrl)) throw new RuntimeException("请配置图片基础路径");
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletCodeUseController.java
+5 -1
View File
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.security.annotation.Inner;
import com.bsd.pjcloud.common.security.service.PjcloudUser;
import com.bsd.pjcloud.common.security.util.SecurityUtils;
import com.bsd.pjcloud.wallet.api.constant.WalletCodeBizEnum;
import com.bsd.pjcloud.wallet.api.dto.WalletCodeUseDto;
import com.bsd.pjcloud.wallet.api.entity.WalletCodeUseEntity;
@@ -86,9 +88,11 @@ public class WalletCodeUseController {
/* ************************************* end 远程调用 end ************************************* */
/* ************************************* start app start ************************************* */
@Operation(summary = "app二维码列表", description = "app二维码列表")
@Operation(summary = "app二维码列表(查询自己的用户)", description = "app二维码列表(查询自己的用户)")
@GetMapping("/app/code-list")
public R appCodeList(@ParameterObject Page page, @ParameterObject WalletCodeUseDto dto) {
PjcloudUser user = SecurityUtils.getUser();
dto.setUserId(user.getId());
return R.ok(walletCodeUseService.pageJoin(page, dto));
}
/* ************************************* end app end ************************************* */
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletForeignController.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class WalletForeignController {
@Operation(summary = "app申请外来人员电子餐券表", description = "app申请外来人员电子餐券表")
@SysLog("app申请外来人员电子餐券")
@PostMapping("/app/apply")
@Idempotent(expireTime = 10, info = "正在申请中，请勿重复操作")
@Idempotent(expireTime = 3, info = "正在申请中，请勿重复操作")
public R appSave(@RequestBody WalletForeignDto dto) {
PjcloudUser loginUser = SecurityUtils.getUser();
dto.setUserId(loginUser.getId());
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletStrideController.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class WalletStrideController {
@Operation(summary = "app申请", description = "app申请")
@SysLog("app申请跨单位就餐")
@PostMapping("/app/apply")
@Idempotent(expireTime = 10, info = "正在申请中，请勿重复操作")
@Idempotent(expireTime = 3, info = "正在申请中，请勿重复操作")
public R appSave(@RequestBody WalletStrideDto dto) {
PjcloudUser loginUser = SecurityUtils.getUser();
dto.setUserId(loginUser.getId());