suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
苏竹红
2025-04-08 15:23:26 +08:00
parent c08905399c d7869f39da
commit 4469c44ebb
43 changed files with 970 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java
View File

@@ -30,7 +30,7 @@ public class PCOrderSysInfoController {
private OrderSysInfoService orderSysInfoService;
@PostMapping("/submitOrderInfo")
@ApiOperation("IT提交订货信息")
@ApiOperation("物流提交订货信息")
public ResponseResult<Integer> submitOrderInfo(@RequestBody @Validated OrderSysInfoRequest request){
request.setType(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType());
return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUserId()));

39
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/HomeTemplateController.java Normal file
View File

@@ -0,0 +1,39 @@
package com.cool.store.controller.webc;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.response.HomeTemplateResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.HomeTemplateUserMappingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @Author: WangShuo
* @Date: 2025/04/08/13:47
* @Version 1.0
* @注释:
*/
@RestController
@RequestMapping("/mini/homeTemp")
@Api(value = "小程序首页模板", description = "小程序首页模板")
public class HomeTemplateController {
@Resource
private HomeTemplateUserMappingService homeTemplateUserMappingService;
@ApiOperation("获取用户小程序首页配置")
@GetMapping("/getUserMiniHomeTemp")
public ResponseResult<HomeTemplateResponse> getUserMiniHomeTemp() {
String partnerId = PartnerUserHolder.getUser().getPartnerId();
return ResponseResult.success(homeTemplateUserMappingService.getHomeTemplateByUserId(partnerId));
}
@ApiOperation("保存用户小程序首页配置")
@PostMapping("/saveUserMiniHomeTemp")
public ResponseResult<Integer> saveUserMiniHomeTemp(@RequestBody HomeTemplateResponse response){
return ResponseResult.success(homeTemplateUserMappingService.insertOrUpdateHomeTemplateUserMapping(response,PartnerUserHolder.getUser().getPartnerId()));
}
}

3
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -317,7 +317,8 @@ public class XxlJobHandler {
List<Long> shopIdList = new ArrayList<>();
while (hasNext) {
PageHelper.startPage(pageNum, pageSize);
List<ShopInfoDO> shopList = shopInfoDAO.getShopIdByShopStatus(ShopStatusEnum.DONE.getCode());
//获取成功开店的门店
List<ShopInfoDO> shopList = shopInfoDAO.getShopIdBySuccessOpen(eid);
if (CollectionUtils.isEmpty(shopList)) {
log.info("------initTallyBook is empty------");
break;