czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-03-12 10:42:54 +08:00
parent aef8116606 8aa5e98317
commit c3bf44d1d6
6 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java
View File

@@ -6,6 +6,7 @@ import com.czg.account.service.ShopMerchantService;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaAdminCheckRole;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +42,7 @@ public class ShopMerchantController {
@SaAdminCheckPermission(value = "shopMerchant:edit", name = "商户支付信息修改")
@PutMapping
public CzgResult<Boolean> edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) {
shopMerchantEditDTO.setShopId(StpKit.USER.getLoginIdAsLong());
return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO));
}
}

2
cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java
View File

@@ -19,7 +19,7 @@ public class StatisticTask {
@Resource
private ShopOrderStatisticService shopOrderStatisticService;
// @Scheduled(cron = "0 0 18 * * ?")
@Scheduled(cron = "0 0 9 * * ?")
public void run() {
shopOrderStatisticService.statistic();
shopProdStatisticService.statistic();