zepengdev
13 hours ago 11f1aaac4aee848dff5d1743baa1ff061da26c58
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java
@@ -73,9 +73,9 @@
    //@PreAuthorize("@el.check('merchant:store:getById')")
    public ResponseEntity<?> getStoreById(@PathVariable Long storeId) {
        Store store = storeService.getById(storeId);
        StoreMerchantView view = new StoreMerchantView();
        BeanUtils.copyProperties(store, view);
        return ResponseEntity.ok(R.success(view));
        /*StoreMerchantView view = new StoreMerchantView();
        BeanUtils.copyProperties(store, view);*/
        return ResponseEntity.ok(R.success(store));
    }
    @GetMapping(value = "/{storeId}/details")
@@ -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")