Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java

@@ -188,7 +188,7 @@
    public ResponseEntity<?> updateAddress(@PathVariable("storeId") Long storeId,
                              @Validated(value = StoreFieldUpdateRequest.UpdateStoreAddressGroup.class)
                              @RequestBody StoreFieldUpdateRequest request) {
        storeService.updateAddress(storeId, request.getAddress(), request.getVersion());
        storeService.updateAddress(storeId, request.getAddress(), request.getLongitude(), request.getLatitude(), request.getVersion());
        return ResponseEntity.noContent().build();
    }

@@ -277,6 +277,20 @@
    }

    /**
     * 修改包装费用
     */
    @PatchMapping(value = "/{storeId}/packagingFee")
    @ApiOperation("修改包装费用")
    /*@PreAuthorize("@el.check('merchant:store:deliveryFee')" +
            " and @storeMerchantOwnershipService.check(#storeId)")*/
    public ResponseEntity<?> updatePackagingFee(@PathVariable("storeId") Long storeId,
                                               @Validated(value = StoreFieldUpdateRequest.UpdateStorePackagingFeeGroup.class)
                                               @RequestBody StoreFieldUpdateRequest request) {
        storeService.updatePackagingFee(storeId, request.getPackagingFee(), request.getVersion());
        return ResponseEntity.noContent().build();
    }

    /**
     * 修改状态
     */
    @PatchMapping(value = "/{storeId}/businessStatus")