Merge #81 into master from cc_20260320_standard_expense_Type
feat：时间调整 * cc_20260320_standard_expense_Type: (40 commits squashed) - feat：费用类型新增 - feat：费用类型 - feat：默认数据 - feat：类型调整 - Merge branch 'master' into cc_20260320_standard_expense_Type - feat：逻辑调整 - Merge branch 'master' into cc_20260320_standard_expense_Type - feat：逻辑调整-标准店 - feat：逻辑调整-标准店 - feat：逻辑调整-标准店 - feat：逻辑调整-标准店 - feat：查询预分账调整 - feat：查询预分账调整 - feat：心愿单 校验调整 - feat：心愿单 校验调整 - feat：心愿单 金额校验调整 - feat：心愿单 金额校验调整 - feat：心愿单 金额校验调整 - feat：先推送账单 再推送 - feat：先推送账单 再推送 - feat：先推送账单 再推送 - feat：先推送账单 再推送 - feat：先推送账单 再推送 - feat：先推送账单 再推送 优化推送 当系统使用费为零的时候 推送数据重置的问题 - Merge branch 'master' into cc_20260320_standard_expense_Type - feat：接口新增字段 - feat：接口新增字段 - feat：接口新增字段 - feat：接口新增字段 - feat：接口新增字段 - feat：接口新增字段 - feat：数据调整 - feat：新增系统服务费 - feat：新增系统服务费 319 - feat：新增系统服务费 319 - feat：新增系统服务费 319 - feat：时间调整 - feat：时间调整 - feat：时间调整 - feat：时间调整 Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/81
This commit is contained in:
正新
@@ -56,6 +56,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.sun.org.apache.xpath.internal.operations.Bool;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.models.auth.In;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
@@ -460,7 +461,7 @@ public class PCTestController {
|
||||
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(shopId);
|
||||
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
|
||||
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
|
||||
PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO);
|
||||
PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO, Integer.valueOf(shopInfoDO.getFranchiseBrand()));
|
||||
pushService.pushFranchiseFeeToXGJ(feeRequest);
|
||||
return ResponseResult.success(Boolean.TRUE);
|
||||
}
|
||||
@@ -505,7 +506,7 @@ public class PCTestController {
|
||||
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(x.getShopId());
|
||||
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(x.getShopId());
|
||||
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
|
||||
PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO);
|
||||
PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO,Integer.valueOf(shopInfoDO.getFranchiseBrand()));
|
||||
pushService.pushFranchiseFeeToXGJ(feeRequest);
|
||||
} catch (Exception e) {
|
||||
log.error("推送数据失败 shopId {},异常信息：{}",x,e.getMessage());
|
||||
@@ -521,7 +522,7 @@ public class PCTestController {
|
||||
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(x.getShopId());
|
||||
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(x.getShopId());
|
||||
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
|
||||
PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO);
|
||||
PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO,Integer.valueOf(shopInfoDO.getFranchiseBrand()));
|
||||
pushService.pushFranchiseFeeToXGJ(feeRequest);
|
||||
List<LinePayDO> franchiseFeePayInfoByShopId = linePayDAO.getFranchiseFeePayInfoByShopId(x.getShopId());
|
||||
franchiseFeePayInfoByShopId.forEach(y->{
|
||||
|
||||
@@ -31,13 +31,13 @@ public class StoreOrderController {
|
||||
|
||||
private final MiniStoreOrderService miniStoreOrderService;
|
||||
|
||||
@ApiOperation("订单 审批拒绝")
|
||||
@ApiOperation("订单 立规确认 加盟商确认")
|
||||
@PostMapping("/passOrder")
|
||||
public ResponseResult<Boolean> passOrder(@RequestBody OrderAuditRecordRequest request) {
|
||||
return ResponseResult.success(miniStoreOrderService.passOrder(request, CurrentUserHolder.getUser()));
|
||||
}
|
||||
|
||||
@ApiOperation("订单 审批通过")
|
||||
@ApiOperation("订单 审批拒绝 废弃")
|
||||
@PostMapping("/rejectOrder")
|
||||
public ResponseResult<Boolean> rejectOrder(@RequestBody OrderAuditRecordRequest request) {
|
||||
return ResponseResult.success(miniStoreOrderService.rejectOrder(request,CurrentUserHolder.getUser()));
|
||||
@@ -67,12 +67,32 @@ public class StoreOrderController {
|
||||
return ResponseResult.success(miniStoreOrderService.payList(shopId));
|
||||
}
|
||||
|
||||
@ApiOperation("批量更新订单配置项数量")
|
||||
@ApiOperation("批量更新订单配置项数量-只可修改数量 不能调整选项")
|
||||
@PostMapping("/batchUpdateOptionQuantity")
|
||||
public ResponseResult<Boolean> batchUpdateOptionQuantity(@RequestBody @Valid PCStoreOrderOptionQuantityUpdateRequest request) {
|
||||
return ResponseResult.success(miniStoreOrderService.batchUpdateOptionQuantity(request));
|
||||
return ResponseResult.success(miniStoreOrderService.batchUpdateOptionQuantity(request,CurrentUserHolder.getUser()));
|
||||
}
|
||||
|
||||
@ApiOperation("管理订单-可调整选项(编辑选配)")
|
||||
@PostMapping("/managerOrder")
|
||||
public ResponseResult<Boolean> managerOrder(@RequestBody @Valid PCStoreOrderOptionQuantityUpdateRequest request) {
|
||||
return ResponseResult.success(miniStoreOrderService.managerOrder(request,CurrentUserHolder.getUser()));
|
||||
}
|
||||
|
||||
@ApiOperation("更换心愿单列表-PC")
|
||||
@GetMapping("/wishlist/list")
|
||||
public ResponseResult<List<MiniStoreWishlistListVO>> wishlistList(@RequestParam(value = "lineId",required = true) Long lineId,
|
||||
@RequestParam(value = "wishlistStatus",required = true) Integer wishlistStatus) {
|
||||
return ResponseResult.success(miniStoreOrderService.wishlistList( lineId,wishlistStatus));
|
||||
}
|
||||
|
||||
@ApiOperation("更换心愿单-PC")
|
||||
@PostMapping("/wishlist/changeWishlist")
|
||||
public ResponseResult<Boolean> wishlistList(@RequestBody ChangeWishlistRequest request) {
|
||||
return ResponseResult.success(miniStoreOrderService.changeWishlist(request));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("心愿单详情")
|
||||
@GetMapping("/wishlist/detail")
|
||||
public ResponseResult<MiniStoreWishlistDetailVO> wishlistDetail(@RequestParam("wishlistId") Long wishlistId) {
|
||||
|
||||
@@ -110,7 +110,7 @@ public class MiniStoreOrderController {
|
||||
@ApiOperation("心愿单列表")
|
||||
@GetMapping("/wishlist/list")
|
||||
public ResponseResult<List<MiniStoreWishlistListVO>> wishlistList() {
|
||||
return ResponseResult.success(miniStoreOrderService.wishlistList( PartnerUserHolder.getUser()));
|
||||
return ResponseResult.success(miniStoreOrderService.wishlistList( PartnerUserHolder.getUser().getLineId(),null));
|
||||
}
|
||||
|
||||
@ApiOperation("心愿单绑定铺位")
|
||||
|
||||
@@ -30,6 +30,7 @@ import com.cool.store.service.close.CloseStoreRefundService;
|
||||
import com.cool.store.service.close.CloseStoreService;
|
||||
import com.cool.store.service.fees.WalletPayInfoService;
|
||||
import com.cool.store.service.impl.CommonService;
|
||||
import com.cool.store.service.store.PreAllocationRecordService;
|
||||
import com.cool.store.service.tp.TpApplyService;
|
||||
import com.cool.store.utils.MDCUtils;
|
||||
import com.cool.store.utils.poi.DateUtils;
|
||||
@@ -131,6 +132,8 @@ public class XxlJobHandler {
|
||||
WalletPayInfoService walletPayInfoService;
|
||||
@Resource
|
||||
WalletTradeDAO walletTradeDAO;
|
||||
@Resource
|
||||
PreAllocationRecordService preAllocationRecordService;
|
||||
|
||||
|
||||
/**
|
||||
@@ -643,4 +646,30 @@ public class XxlJobHandler {
|
||||
}
|
||||
log.info("------end batchTransferQuery------");
|
||||
}
|
||||
|
||||
@XxlJob("batchTransferStandardStore")
|
||||
public void batchTransferStandardStore() {
|
||||
MDCUtils.put(CommonConstants.REQUEST_ID, UUID.randomUUID().toString());
|
||||
log.info("------start batchTransferStandardStore------");
|
||||
boolean hasNext = true;
|
||||
int pageNum = 1;
|
||||
int pageSize = CommonConstants.BATCH_SIZE;
|
||||
while (hasNext) {
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
List<String> batchCodes = walletTradeDAO.getPayingOrderBatchCode(WalletTradeModuleEnum.STANDARD_STORE.getModule(), 1);
|
||||
hasNext = batchCodes.size() >= pageSize;
|
||||
if (CollectionUtils.isEmpty(batchCodes)) {
|
||||
break;
|
||||
}
|
||||
for (String batchCode : batchCodes) {
|
||||
try {
|
||||
preAllocationRecordService.queryAndUpdateBatchTransferStatus(batchCode);
|
||||
} catch (Exception e) {
|
||||
log.error("钱包批量转账分账支付状态查询失败, batchCode:{}", batchCode, e);
|
||||
}
|
||||
}
|
||||
pageNum++;
|
||||
}
|
||||
log.info("------end batchTransferStandardStore------");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user