From 310ae0be7dac1830aea2e7f596e9e23b570473fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Mon, 30 Mar 2026 13:20:15 +0000 Subject: [PATCH] Merge #81 into master from cc_20260320_standard_expense_Type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/81 --- .../com/cool/store/enums/ErrorCodeEnum.java | 5 + .../cool/store/enums/fees/PayTypeEnum.java | 2 +- .../store/enums/fees/WalletFeeItemEnum.java | 43 + .../enums/order/StoreOrderStatusEnum.java | 5 +- .../enums/point/ShopSubStageStatusEnum.java | 5 +- .../store/dao/config/ConfigOptionDAO.java | 5 +- .../dao/fees/WalletAllocationConfigDAO.java | 10 + .../dao/order/PreAllocationRecordDAO.java | 18 + .../cool/store/dao/order/StoreOrderDAO.java | 4 + .../order/StoreOrderOptionSnapshotDAO.java | 9 + .../store/dao/order/StoreWishlistDAO.java | 10 +- .../store/dao/store/StoreTypeOptionDAO.java | 7 + .../fees/WalletAllocationConfigMapper.java | 9 + .../order/PreAllocationRecordMapper.java | 6 + .../order/StoreOrderOptionSnapshotMapper.java | 3 + .../mapper/order/StoreWishlistMapper.java | 9 +- .../mapper/config/ConfigItemMapper.xml | 6 + .../mapper/config/ConfigOptionMapper.xml | 3 +- .../fees/WalletAllocationConfigMapper.xml | 24 + .../order/PreAllocationRecordMapper.xml | 32 + .../order/StoreOrderOptionSnapshotMapper.xml | 22 +- .../mapper/order/StoreWishlistMapper.xml | 11 + .../store/dto/fees/ExpenseTypeAmountDTO.java | 19 + .../store/dto/fees/WalletAllocationDTO.java | 21 + .../store/entity/config/ConfigItemDO.java | 6 + .../store/entity/config/ConfigOptionDO.java | 3 + .../order/StoreOrderOptionSnapshotDO.java | 3 + .../config/ConfigItemUpdateRequest.java | 6 + .../config/ConfigOptionQueryRequest.java | 2 + .../config/ConfigOptionUpdateRequest.java | 2 + .../request/order/ChangeWishlistRequest.java | 26 + .../store/PreAllocationSaveRequest.java | 9 + .../request/wallet/BatchTransferRequest.java | 2 + .../request/xgj/PushFranchiseFeeRequest.java | 12 +- .../cool/store/vo/config/ConfigItemVO.java | 2 + .../cool/store/vo/config/ConfigOptionVO.java | 1 + .../vo/order/MiniStoreOrderDetailVO.java | 5 + .../config/impl/ConfigItemServiceImpl.java | 4 + .../config/impl/ConfigOptionServiceImpl.java | 5 +- .../fees/impl/WalletPayInfoServiceImpl.java | 2 +- .../service/impl/FranchiseFeeServiceImpl.java | 22 +- .../impl/SignFranchiseServiceImpl.java | 15 + .../service/order/MiniStoreOrderService.java | 11 +- .../order/impl/MiniStoreOrderServiceImpl.java | 799 ++++++++++++------ .../store/PreAllocationRecordService.java | 5 + .../impl/PreAllocationRecordServiceImpl.java | 635 +++++++++++++- .../controller/webb/PCTestController.java | 7 +- .../controller/webb/StoreOrderController.java | 28 +- .../webc/MiniStoreOrderController.java | 2 +- .../com/cool/store/job/XxlJobHandler.java | 29 + 50 files changed, 1606 insertions(+), 325 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/fees/ExpenseTypeAmountDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/fees/WalletAllocationDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/order/ChangeWishlistRequest.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 04737dad2..4c7d167e7 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -361,6 +361,11 @@ public enum ErrorCodeEnum { DUPLICATE_PAYMENTS(1610108, "订单支付中，请勿重复支付！", null), CURRENT_ORDER_NOT_SUPPORT(1610109, "当前订单状态不支持审批！", null), CURRENT_POINT_BIND_OTHER_WISHLIST(1610110, "当前铺位绑定了其他心愿单！", null), + CURRENT_ORDER_STATUS_NOT_SUPPORT_CHANGE(1610111, "当前订单状态不支持变换心愿单！", null), + CURRENT_WISHLIST_BIND_OTHER_POINT(1610112, "当前心愿单绑定了其他铺位！", null), + ORDER_DATA_EXCEPTION(1610113, "心愿单数据异常！", null), + CURRENT_WISHLIST_NOT_EXIST(1610112, "当前心愿单不存在！", null), + diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/PayTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/PayTypeEnum.java index cf7a0fb8f..14e684813 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/PayTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/PayTypeEnum.java @@ -16,7 +16,7 @@ import lombok.Getter; public enum PayTypeEnum { OFFLINE(1, "线下支付"), - PING_AN(2, "平安钱包支付"), + PING_AN(2, "网商钱包支付"), ; private final Integer type; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java index 3fb30d750..56c11a659 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java @@ -1,8 +1,15 @@ package com.cool.store.enums.fees; +import com.cool.store.enums.point.ShopSubStageEnum; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static com.cool.store.enums.point.ShopSubStageEnum.SHOP_STAGE_28; + /** *

* 钱包转账费用科目枚举类 @@ -18,6 +25,7 @@ public enum WalletFeeItemEnum { MANAGEMENT_FEE(311, "expense_management_fee", "管理费（年）"), BRAND_USAGE_FEE(312, "expense_brand_usage_fee", "品牌使用费（年）"), DESIGN_FEE_GROUP(313, "expense_design_fee_group", "设计费-集团"), + SYSTEM_SERVICE_FEE(319,"expense_system_service_money","系统服务费（年）"), // DESIGN_FEE_LG(314, "expense_design_fee_lg", "设计费-立规"), EARNEST_MONEY(315, "expense_earnest_money", "保证金"), EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"), @@ -39,6 +47,19 @@ public enum WalletFeeItemEnum { return null; } + public static String getByExpenseTypeName(String expenseType) { + for (WalletFeeItemEnum value : WalletFeeItemEnum.values()) { + if (value.expenseType.equals(expenseType)) { + return value.getDesc(); + } + } + return null; + } + + public static List getBaseExpenseType(){ + return Arrays.asList(FRANCHISE_FEE,MANAGEMENT_FEE,BRAND_USAGE_FEE,DESIGN_FEE_GROUP,EARNEST_MONEY,SYSTEM_SERVICE_FEE); + } + public static WalletFeeItemEnum getByFeeItemId(Integer feeItemId) { for (WalletFeeItemEnum value : WalletFeeItemEnum.values()) { if (value.feeItemId.equals(feeItemId)) { @@ -47,4 +68,26 @@ public enum WalletFeeItemEnum { } return null; } + + + public static List getWalletFeeItemBySubStage(Integer subStage){ + ShopSubStageEnum subStageEnum = ShopSubStageEnum.getByShopSubStage(subStage); + if (subStageEnum==null){ + return null; + } + switch (subStageEnum){ + case SHOP_STAGE_28: + return Arrays.asList( + FRANCHISE_FEE.getExpenseType(), + MANAGEMENT_FEE.getExpenseType(), + BRAND_USAGE_FEE.getExpenseType(), + DESIGN_FEE_GROUP.getExpenseType(), + EARNEST_MONEY.getExpenseType()); + case SHOP_STAGE_27: + return Arrays.asList(EXPENSE_DECORATION_MONEY.getExpenseType(), + EXPENSE_EQUIPMENT_MONEY.getExpenseType()); + default: + return null; + } + } } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/order/StoreOrderStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/order/StoreOrderStatusEnum.java index 6ff1013a6..40eae1177 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/order/StoreOrderStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/order/StoreOrderStatusEnum.java @@ -12,10 +12,11 @@ public enum StoreOrderStatusEnum { DRAFT(0, "草稿"), WAIT_CONFIRM(5, "待立规确认"), - INVEST_MANAGER_CONFIRM(7, "待招商经理确认"), - FINANCIAL_CONFIRM(8, "待财务确认"), + INVEST_MANAGER_CONFIRM(7, "待加盟商确认"), + FINANCIAL_CONFIRM(8, "待内勤确认"), WAIT_ADJUST(10, "待调整"), WAIT_PAY(15, "待支付"), + PART_OF_WAIT_PAY(17, "部分支付"), PAID(20, "已支付"), PAY_FAIL(22, "支付失败"), CLOSED(25, "已关闭"); diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java index 67bb62720..02201952b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java @@ -168,11 +168,12 @@ public enum ShopSubStageStatusEnum { SHOP_SUB_STAGE_STATUS_280(ShopSubStageEnum.SHOP_STAGE_28, 2800, "待选购", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_281(ShopSubStageEnum.SHOP_STAGE_28, 2810, "待立规审批", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_281(ShopSubStageEnum.SHOP_STAGE_28, 2810, "待立规确认", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_281_5(ShopSubStageEnum.SHOP_STAGE_28, 2815, "待加盟商确认", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_282(ShopSubStageEnum.SHOP_STAGE_28, 2820, "待财务确认", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_282(ShopSubStageEnum.SHOP_STAGE_28, 2820, "待内勤确认分账", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_283(ShopSubStageEnum.SHOP_STAGE_28, 2830, "审批拒绝", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_284(ShopSubStageEnum.SHOP_STAGE_28, 2840, "待缴费", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_284_5(ShopSubStageEnum.SHOP_STAGE_28, 2845, "对账中", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_285(ShopSubStageEnum.SHOP_STAGE_28, 2850, "已完成", Boolean.TRUE), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/config/ConfigOptionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/config/ConfigOptionDAO.java index 42ae34562..d01f4c1ae 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/config/ConfigOptionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/config/ConfigOptionDAO.java @@ -40,7 +40,7 @@ public class ConfigOptionDAO { return configOptionMapper.deleteByExample(example) > 0; } - public List query(String categoryCode, String itemCode, Integer active, String optionName) { + public List query(String categoryCode, String itemCode, Integer active, String optionName,String expenseTypeCode) { Example example = new Example(ConfigOptionDO.class); Example.Criteria criteria = example.createCriteria(); if (Objects.nonNull(categoryCode)) { @@ -52,6 +52,9 @@ public class ConfigOptionDAO { if (Objects.nonNull(active)) { criteria.andEqualTo("active", active); } + if (Objects.nonNull(expenseTypeCode)) { + criteria.andEqualTo("expense_type_code", expenseTypeCode); + } if (Objects.nonNull(optionName) && !optionName.trim().isEmpty()) { criteria.andLike("optionName", "%" + optionName.trim() + "%"); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/fees/WalletAllocationConfigDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/fees/WalletAllocationConfigDAO.java index 7a779c3a3..4d35065f6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/fees/WalletAllocationConfigDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/fees/WalletAllocationConfigDAO.java @@ -1,5 +1,6 @@ package com.cool.store.dao.fees; +import com.cool.store.dto.fees.WalletAllocationDTO; import com.cool.store.entity.fees.WalletAllocationConfigDO; import com.cool.store.mapper.fees.WalletAllocationConfigMapper; import lombok.RequiredArgsConstructor; @@ -62,6 +63,15 @@ public class WalletAllocationConfigDAO { return walletAllocationConfigMapper.selectByExample(example); } + + + public List selectByExpenseTypeList(Integer joinBrand, List expenseTypeList) { + if (joinBrand==null){ + return null; + } + return walletAllocationConfigMapper.getAllWalletAllocation(joinBrand,expenseTypeList); + } + /** * 分页查询 */ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java index 0de7a3fc4..e300f4aff 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java @@ -41,6 +41,10 @@ public class PreAllocationRecordDAO { return preAllocationRecordMapper.deleteByShopId(shopId) > 0; } + public boolean updateByPayNoList(List payNoList,Integer status) { + return preAllocationRecordMapper.updateByPayNoList(payNoList,status)>0; + } + public boolean insertBatch(List list) { return preAllocationRecordMapper.insertBatch(list) > 0; } @@ -49,7 +53,21 @@ public class PreAllocationRecordDAO { return preAllocationRecordMapper.updateBatch(list) > 0; } + public boolean batchUpdateEditableFields(List list) { + if (list == null || list.isEmpty()) { + return false; + } + return preAllocationRecordMapper.batchUpdateEditableFields(list) > 0; + } + public boolean updateByOrderId(Long orderId) { return preAllocationRecordMapper.updateByOrderId(orderId) > 0; } + + public boolean deleteByIdsNotPaid(List ids) { + if (ids == null || ids.isEmpty()) { + return false; + } + return preAllocationRecordMapper.deleteByIdsNotPaid(ids) > 0; + } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderDAO.java index 0916f32a1..046f28c01 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderDAO.java @@ -23,6 +23,10 @@ public class StoreOrderDAO { return storeOrderMapper.getById(id); } + public Integer deleteById(StoreOrderDO storeOrderDO){ + return storeOrderMapper.delete(storeOrderDO); + } + public List queryPage(Long shopId, Integer status) { return storeOrderMapper.queryPage(shopId, status); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderOptionSnapshotDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderOptionSnapshotDAO.java index 6774dd05e..99acbcf5f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderOptionSnapshotDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreOrderOptionSnapshotDAO.java @@ -1,5 +1,6 @@ package com.cool.store.dao.order; +import com.cool.store.dto.fees.ExpenseTypeAmountDTO; import com.cool.store.entity.order.StoreOrderOptionSnapshotDO; import com.cool.store.mapper.order.StoreOrderOptionSnapshotMapper; import lombok.RequiredArgsConstructor; @@ -7,8 +8,10 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.math.BigDecimal; import java.util.Collections; import java.util.List; +import java.util.Map; @Repository @RequiredArgsConstructor @@ -51,4 +54,10 @@ public class StoreOrderOptionSnapshotDAO { mapper.batchUpdateQuantityAndAmount(list); } + public List getExpenseTypeAmountByOrderId(Long orderId) { + if (orderId == null) { + return Collections.emptyList(); + } + return mapper.getExpenseTypeAmountByOrderId(orderId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistDAO.java index 48db10e3b..937fa9004 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistDAO.java @@ -82,15 +82,21 @@ public class StoreWishlistDAO { return mapper.listByLineIdAndStoreTypeAndVersion(lineId, storeTypeId, versionNo); } - public List listByLineId(Long lineId, Long storeTypeId) { + public List listByLineId(Long lineId, Long storeTypeId,Integer wishlistStatus) { if (lineId == null) { return Collections.emptyList(); } - return mapper.listByLineId(lineId, storeTypeId); + return mapper.listByLineId(lineId, storeTypeId,wishlistStatus); } public List listByVersionList(String keyword,Long storeTypeId,Integer wishlistStatus) { return mapper.listByVersionList(keyword,storeTypeId,wishlistStatus); } + public Boolean unbindPoint(Long id) { + if (id == null) { + return Boolean.FALSE; + } + return mapper.unbindPoint(id); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreTypeOptionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreTypeOptionDAO.java index 7e80e4936..57cfbc09e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreTypeOptionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreTypeOptionDAO.java @@ -1,5 +1,6 @@ package com.cool.store.dao.store; +import com.cool.store.entity.AssessmentDataDO; import com.cool.store.entity.CloseStoreAuditRecordDO; import com.cool.store.entity.store.StoreTypeDO; import com.cool.store.entity.store.StoreTypeOptionDO; @@ -42,6 +43,12 @@ public class StoreTypeOptionDAO { return mapper.updateByExampleSelective(update,example); } + public List selectByIds(List optionIds,Long storeTypeId){ + Example example = new Example(StoreTypeOptionDO.class); + example.createCriteria().andIn("optionId", optionIds).andEqualTo("storeTypeId",storeTypeId); + return mapper.selectByExample(example); + } + public List listByStoreTypeId(Long storeTypeId) { return mapper.select(StoreTypeOptionDO.builder().storeTypeId(storeTypeId).build()); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/fees/WalletAllocationConfigMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/fees/WalletAllocationConfigMapper.java index b56e2426f..96db140c6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/fees/WalletAllocationConfigMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/fees/WalletAllocationConfigMapper.java @@ -1,7 +1,16 @@ package com.cool.store.mapper.fees; +import com.cool.store.dto.fees.WalletAllocationDTO; import com.cool.store.entity.fees.WalletAllocationConfigDO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface WalletAllocationConfigMapper extends Mapper { + + List getAllWalletAllocation(@Param("joinBrand") Integer joinBrand, + @Param("expenseTypeList") List expenseTypeList); + + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java index d6f68aca0..280aaa15b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java @@ -24,5 +24,11 @@ public interface PreAllocationRecordMapper extends Mapper int updateBatch(@Param("list") List list); + int batchUpdateEditableFields(@Param("list") List list); + int updateByOrderId(Long orderId); + + int deleteByIdsNotPaid(@Param("ids") List ids); + + Integer updateByPayNoList(@Param("payNoList") List payNoList, @Param("status") Integer status); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreOrderOptionSnapshotMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreOrderOptionSnapshotMapper.java index 42f85d6cb..3de482e64 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreOrderOptionSnapshotMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreOrderOptionSnapshotMapper.java @@ -1,5 +1,6 @@ package com.cool.store.mapper.order; +import com.cool.store.dto.fees.ExpenseTypeAmountDTO; import com.cool.store.entity.order.StoreOrderOptionSnapshotDO; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -15,4 +16,6 @@ public interface StoreOrderOptionSnapshotMapper extends Mapper list); + + List getExpenseTypeAmountByOrderId(@Param("orderId") Long orderId); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistMapper.java index 5d6088e66..2844dd67c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistMapper.java @@ -27,7 +27,8 @@ public interface StoreWishlistMapper extends Mapper { @Param("versionNo") String versionNo); List listByLineId(@Param("lineId") Long lineId, - @Param("storeTypeId") Long storeTypeId); + @Param("storeTypeId") Long storeTypeId, + @Param("wishlistStatus") Integer wishlistStatus); List listByVersionList(@Param("keyword") String keyword, @@ -41,5 +42,11 @@ public interface StoreWishlistMapper extends Mapper { */ Boolean updateByLineId(Long lineId) ; + /** + * 心愿单解绑点位 + * @return + */ + Boolean unbindPoint(@Param("wishlistId") Long wishlistId); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/config/ConfigItemMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/config/ConfigItemMapper.xml index 9ac56d335..001639833 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/config/ConfigItemMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/config/ConfigItemMapper.xml @@ -11,6 +11,8 @@ + + @@ -27,6 +29,8 @@ + + @@ -43,6 +47,8 @@ i.sort_no, i.status, i.remark, + i.expense_type_code, + i.multiple_choice, i.created_user_id, i.created_time, i.updated_user_id, diff --git a/coolstore-partner-dao/src/main/resources/mapper/config/ConfigOptionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/config/ConfigOptionMapper.xml index 8b186dc16..81b765956 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/config/ConfigOptionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/config/ConfigOptionMapper.xml @@ -19,13 +19,14 @@ + id, category_code, item_code, option_code, option_name, option_description, option_price, original_option_price, image_url, video_url, is_active, sort_order, option_remark, - create_time, update_time, option_unit + create_time, update_time, option_unit,expense_type_code + select + a.join_brand as joinBrand, + a.expense_type as expenseType, + b.payee_code as payeeCode, + b.payee_name as payeeName + from zxjp_fees_wallet_allocation_config a + left join zxjp_fees_wallet_allocation_company b + on a.id = b.config_id + + + and join_brand = #{joinBrand} + + + and expense_type in ( + + #{item} + + ) + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml index 2295a3461..4d61cc991 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml @@ -80,6 +80,19 @@ + + + UPDATE zxjp_pre_allocation_record + SET expense_type = #{i.expenseType}, + payee_name = #{i.payeeName}, + payee_code = #{i.payeeCode}, + pay_amount = #{i.payAmount}, + update_time = NOW() + WHERE id = #{i.id} + AND allocation_status != 1 + + + UPDATE zxjp_pre_allocation_record @@ -90,6 +103,25 @@ + + UPDATE zxjp_pre_allocation_record + SET allocation_status = #{status}, + update_time = NOW() + where pay_no in + + #{item} + + + + + DELETE FROM zxjp_pre_allocation_record + WHERE allocation_status != 1 + AND id IN + + #{id} + + + diff --git a/coolstore-partner-dao/src/main/resources/mapper/order/StoreOrderOptionSnapshotMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/order/StoreOrderOptionSnapshotMapper.xml index c2dea1280..a5091cb90 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/order/StoreOrderOptionSnapshotMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/order/StoreOrderOptionSnapshotMapper.xml @@ -22,25 +22,26 @@ + id, order_id, shop_id, store_type_id, option_id, category_code, item_code, option_code, option_name, option_price, original_option_price, option_remark, image_url, video_url, - quantity, amount, original_amount, create_time, option_unit + quantity, amount, original_amount, create_time, option_unit, expense_type_code INSERT INTO zxjp_store_order_option_snapshot (order_id, shop_id, store_type_id, option_id, category_code, item_code, option_code, option_name, option_price, original_option_price, option_remark, image_url, video_url, - quantity, amount, original_amount, create_time, option_unit) + quantity, amount, original_amount, create_time, option_unit,expense_type_code) VALUES (#{item.orderId}, #{item.shopId}, #{item.storeTypeId}, #{item.optionId}, #{item.categoryCode}, #{item.itemCode}, #{item.optionCode}, #{item.optionName}, #{item.optionPrice}, #{item.originalOptionPrice}, #{item.optionRemark}, #{item.imageUrl}, #{item.videoUrl}, - #{item.quantity}, #{item.amount}, #{item.originalAmount}, NOW(), #{item.optionUnit}) + #{item.quantity}, #{item.amount}, #{item.originalAmount}, NOW(), #{item.optionUnit}, #{item.expenseTypeCode}) @@ -64,7 +65,8 @@ a.amount, a.original_amount, a.create_time, - a.option_unit + a.option_unit, + a.expense_type_code FROM zxjp_store_order_option_snapshot a left join zxjp_cfg_item_category b on a.category_code = b.category_code WHERE order_id = #{orderId} @@ -103,4 +105,16 @@ + + diff --git a/coolstore-partner-dao/src/main/resources/mapper/order/StoreWishlistMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/order/StoreWishlistMapper.xml index 9e340b171..19988bfbb 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/order/StoreWishlistMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/order/StoreWishlistMapper.xml @@ -85,6 +85,9 @@ AND w.store_type_id = #{storeTypeId} + + AND w.wishlist_status = #{wishlistStatus} + ORDER BY w.create_time DESC @@ -129,6 +132,14 @@ AND deleted = 0 + + UPDATE zxjp_store_wishlist + SET wishlist_status = 5, + point_id = null, + update_time = NOW() + WHERE id = #{wishlistId} + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/fees/ExpenseTypeAmountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/fees/ExpenseTypeAmountDTO.java new file mode 100644 index 000000000..6d8ffaa78 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/fees/ExpenseTypeAmountDTO.java @@ -0,0 +1,19 @@ +package com.cool.store.dto.fees; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Auther zx_szh + * @Date 2026/3/23 14:20 + * @Version 1.0 + */ +@Data +public class ExpenseTypeAmountDTO { + + private BigDecimal totalAmount; + + private String expenseType; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/fees/WalletAllocationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/fees/WalletAllocationDTO.java new file mode 100644 index 000000000..cf9ead60c --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/fees/WalletAllocationDTO.java @@ -0,0 +1,21 @@ +package com.cool.store.dto.fees; + +import lombok.Data; + +/** + * @Auther zx_szh + * @Date 2026/3/23 11:31 + * @Version 1.0 + */ +@Data +public class WalletAllocationDTO { + + private Integer joinBrand; + + private String expenseType; + + private String payeeCode; + + private String payeeName; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigItemDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigItemDO.java index b33becf25..ec2ab02ed 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigItemDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigItemDO.java @@ -39,6 +39,12 @@ public class ConfigItemDO implements Serializable { @Column(name = "remark") private String remark; + @Column(name = "expense_type_code") + private String expenseTypeCode; + + @Column(name = "multiple_choice") + private Integer multipleChoice; + @Column(name = "created_user_id") private String createdUserId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigOptionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigOptionDO.java index 222aa4cbf..d1ff3341a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigOptionDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigOptionDO.java @@ -72,4 +72,7 @@ public class ConfigOptionDO implements Serializable { @Column(name = "update_time") private Date updateTime; + + @Column(name = "expense_type_code") + private String expenseTypeCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/order/StoreOrderOptionSnapshotDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/order/StoreOrderOptionSnapshotDO.java index 7baef5c7e..acaa35af7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/order/StoreOrderOptionSnapshotDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/order/StoreOrderOptionSnapshotDO.java @@ -77,4 +77,7 @@ public class StoreOrderOptionSnapshotDO { @Column(name = "option_unit") private String optionUnit; + + @Column(name = "expense_type_code") + private String expenseTypeCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigItemUpdateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigItemUpdateRequest.java index f9257c4f6..2f5771291 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigItemUpdateRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigItemUpdateRequest.java @@ -35,4 +35,10 @@ public class ConfigItemUpdateRequest { @ApiModelProperty("备注") private String remark; + + @ApiModelProperty("费用类型 字典表") + private String expenseTypeCode; + + @ApiModelProperty("是否支持多选 1-是 2-否") + private Integer multipleChoice; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionQueryRequest.java index 5a105cccd..7dd8da1b3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionQueryRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionQueryRequest.java @@ -18,4 +18,6 @@ public class ConfigOptionQueryRequest extends PageBasicInfo { @ApiModelProperty("选项名称(模糊)") private String optionName; + + private String expenseTypeCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionUpdateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionUpdateRequest.java index 34228d272..1d83f9691 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionUpdateRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigOptionUpdateRequest.java @@ -54,4 +54,6 @@ public class ConfigOptionUpdateRequest { private Integer sortOrder; @ApiModelProperty("配置项选项明细") private String optionRemark; + @ApiModelProperty("费用类型 字典表") + private String expenseTypeCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/order/ChangeWishlistRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/order/ChangeWishlistRequest.java new file mode 100644 index 000000000..f6e50f1dd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/order/ChangeWishlistRequest.java @@ -0,0 +1,26 @@ +package com.cool.store.request.order; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Auther zx_szh + * @Date 2026/3/25 19:32 + * @Version 1.0 + */ +@Data +public class ChangeWishlistRequest { + + @ApiModelProperty("门店ID") + private Long shopId; + + @ApiModelProperty("订单ID") + private Long orderId; + + @ApiModelProperty("心愿单ID") + private Long wishlistId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/store/PreAllocationSaveRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/store/PreAllocationSaveRequest.java index a09aeb7af..1d9b81b3c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/store/PreAllocationSaveRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/store/PreAllocationSaveRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.Valid; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @@ -21,9 +23,15 @@ public class PreAllocationSaveRequest { @NotNull @ApiModelProperty("门店ID") Long shopId; + + @ApiModelProperty("流程子阶段") + Integer subStage; @Valid List items; @Data public static class PreAllocationItem{ + + private Long id; + @ApiModelProperty("缴费类型") String expenseType; @ApiModelProperty("公司名称") @@ -32,6 +40,7 @@ public class PreAllocationSaveRequest { String payeeCode; @ApiModelProperty("分账金额") @NotNull + @DecimalMin(value = "0.00", inclusive = true) BigDecimal payAmount; } } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java index 92bf2c210..7f8d133d2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java @@ -26,6 +26,8 @@ public class BatchTransferRequest { private String payPwd; + private Integer verifyPassword; + private List transArray; @Data diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java index 373356ea5..91e70583b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java @@ -1,6 +1,7 @@ package com.cool.store.request.xgj; import com.cool.store.entity.FranchiseFeeDO; +import com.cool.store.enums.FranchiseBrandEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.StringUtils; @@ -52,7 +53,7 @@ public class PushFranchiseFeeRequest { private Integer joinBrand; public PushFranchiseFeeRequest(){} - public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO){ + public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO,Integer joinBrand){ this.setShopId(shopId); this.setPartnerName(partnerName); this.setBillId(franchiseFeeDO.getId().intValue()); @@ -61,8 +62,8 @@ public class PushFranchiseFeeRequest { this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee())); this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee())); this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond())); - // 三明治收银费 - if (StringUtils.isNotBlank(franchiseFeeDO.getCashierFee())) { + // 三明治收银费 不为空 且不为零的时候 + if (FranchiseBrandEnum.ZXSMZ.getCode()==joinBrand) { this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee())); } this.setTotalFee(this.getBond() @@ -73,4 +74,9 @@ public class PushFranchiseFeeRequest { this.setCreateTime(franchiseFeeDO.getCreateTime()); } + public static void main(String[] args) { + BigDecimal bigDecimal = new BigDecimal(0.00); + + } + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigItemVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigItemVO.java index 844247758..662f09867 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigItemVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigItemVO.java @@ -16,6 +16,8 @@ public class ConfigItemVO { private Integer sortNo; private Integer status; private String remark; + private String expenseTypeCode; + private Integer multipleChoice; private String createdUserId; private Date createdTime; private String updatedUserId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigOptionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigOptionVO.java index 83587aaea..1ebcf3499 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigOptionVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigOptionVO.java @@ -23,4 +23,5 @@ public class ConfigOptionVO { private String optionRemark; private Date createTime; private Date updateTime; + private String expenseTypeCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreOrderDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreOrderDetailVO.java index 498fe5109..a71a70539 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreOrderDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreOrderDetailVO.java @@ -179,5 +179,10 @@ public class MiniStoreOrderDetailVO { @ApiModelProperty("图片") private String imageUrl; + + @ApiModelProperty("费用类型code") + private String expenseTypeCode; + + private BigDecimal defaultQuantity; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigItemServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigItemServiceImpl.java index 79ebd0edc..ad0d5a50c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigItemServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigItemServiceImpl.java @@ -45,6 +45,8 @@ public class ConfigItemServiceImpl implements ConfigItemService { entity.setSortNo(request.getSortNo()); entity.setStatus(request.getStatus()); entity.setRemark(request.getRemark()); + entity.setExpenseTypeCode(request.getExpenseTypeCode()); + entity.setMultipleChoice(request.getMultipleChoice()); entity.setCreatedTime(new Date()); entity.setCreatedUserId(userInfo.getUserId()); entity.setIsDeleted(0); @@ -66,6 +68,8 @@ public class ConfigItemServiceImpl implements ConfigItemService { entity.setSortNo(request.getSortNo()); entity.setStatus(request.getStatus()); entity.setRemark(request.getRemark()); + entity.setExpenseTypeCode(request.getExpenseTypeCode()); + entity.setMultipleChoice(request.getMultipleChoice()); entity.setUpdatedTime(new Date()); entity.setUpdatedUserId(userInfo.getUserId()); return configItemDAO.updateSelective(entity); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigOptionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigOptionServiceImpl.java index a37e5450b..be3a939c3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigOptionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/config/impl/ConfigOptionServiceImpl.java @@ -65,7 +65,8 @@ public class ConfigOptionServiceImpl implements ConfigOptionService { @Override public PageInfo queryPage(ConfigOptionQueryRequest request) { PageHelper.startPage(request.getPageNum(), request.getPageSize()); - List list = configOptionDAO.query(request.getCategoryCode(), request.getItemCode(), request.getActive(), request.getOptionName()); + List list = configOptionDAO.query(request.getCategoryCode(), request.getItemCode(), + request.getActive(), request.getOptionName(),request.getExpenseTypeCode()); return BeanUtil.toPage(new PageInfo<>(list), ConfigOptionVO.class); } @@ -83,7 +84,7 @@ public class ConfigOptionServiceImpl implements ConfigOptionService { .collect(Collectors.toMap(ConfigItemVO::getItemCode, Function.identity(), (a, b) -> a)); // 3) 一次性查询所有激活的配置选项（可选模糊名称） - List options = configOptionDAO.query(null, null, 1, null); + List options = configOptionDAO.query(null, null, 1, null,null); if (CollectionUtils.isEmpty(options)) { return Collections.emptyList(); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/WalletPayInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/WalletPayInfoServiceImpl.java index f5a622729..9bf8ab71b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/WalletPayInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/WalletPayInfoServiceImpl.java @@ -126,7 +126,7 @@ public class WalletPayInfoServiceImpl implements WalletPayInfoService { assert feeItem != null; return new BatchTransferRequest.TransDataRequest(payNo, feeItem.getFeeItemId(), shopAllocationInfoDO.getPayeeCode(), null, payAmount.toString(), feeItem.getDesc()); }); - BatchTransferRequest transRequest = new BatchTransferRequest(walletType, shopInfo.getStoreId(), request.getPayPwd(), transDataList); + BatchTransferRequest transRequest = new BatchTransferRequest(walletType, shopInfo.getStoreId(), request.getPayPwd(),0, transDataList); BatchTransferDTO batchTransferDTO = walletApiService.batchTransfer(transRequest); if (CollectionUtils.isEmpty(batchTransferDTO.getTransArray())) { throw new ServiceException(ErrorCodeEnum.WALLET_TRANS_FAIL); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 085d29f7f..e59872a09 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -129,7 +129,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.PAY_FRANCHISE_FEES); //推送加盟费信息到新管家 - PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO,Integer.valueOf(shopInfoDO.getFranchiseBrand())); feeRequest.setJoinBrand(Integer.valueOf(shopInfoDO.getFranchiseBrand())); pushService.pushFranchiseFeeToXGJ(feeRequest); return true; @@ -179,7 +179,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { shopAllocationInfoService.updateBatch(request.getShopId(), request.getShopAllocationInfoList()); //推送加盟费信息到新管家 franchiseFeeDO.setCreateTime(franchiseFeeDO1.getCreateTime()); - PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO,Integer.valueOf(shopInfoDO.getFranchiseBrand())); feeRequest.setJoinBrand(Integer.valueOf(shopInfoDO.getFranchiseBrand())); pushService.pushFranchiseFeeToXGJ(feeRequest); return true; @@ -313,6 +313,16 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { franchiseFeeDO.setXgjCollectionStatus(request.getPaymentStatus()); franchiseFeeDO.setXgjRemainderPayableAmount(request.getRemainingFee()); franchiseFeeDO.setXgjFeesPaid(request.getPaidFees()); + List stageList = new ArrayList<>(); + if (shopInfoDO.getUseStandardStore()==0){ + stageList.add(SHOP_SUB_STAGE_STATUS_73); + stageList.add(SHOP_SUB_STAGE_STATUS_80); + }else { + //标准店 + stageList.add(SHOP_SUB_STAGE_STATUS_285); + stageList.add(SHOP_SUB_STAGE_STATUS_80); + } + if (request.getPayableFee().compareTo(request.getPaidFees())==-1){ franchiseFeeDO.setXgjRemainderPayableAmount(new BigDecimal("0")); franchiseFeeDO.setXgjCollectionStatus(XGJCollectionStatusEnum.COMPLETED.getCode()); @@ -322,15 +332,15 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { lastPay.setRemark(lastPay.getRemark()+"系统监测到您多缴费"+request.getPaidFees().subtract(request.getPayableFee())+"元 请申请退款或留做他用!"); linePayMapper.updateByPrimaryKeySelective(lastPay); ShopStageInfoDO shopStageStatus = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_8); - if (SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopStageStatus.getShopSubStageStatus())){ - shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(),Arrays.asList(SHOP_SUB_STAGE_STATUS_73,SHOP_SUB_STAGE_STATUS_80)); + if (shopStageStatus!=null&&SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopStageStatus.getShopSubStageStatus())){ + shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(),stageList); } } franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO); if (XGJCollectionStatusEnum.COMPLETED.getCode().equals(request.getPaymentStatus())){ ShopStageInfoDO shopStageStatus = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_8); - if (SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopStageStatus.getShopSubStageStatus())){ - shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(),Arrays.asList(SHOP_SUB_STAGE_STATUS_73,SHOP_SUB_STAGE_STATUS_80)); + if (shopStageStatus!=null&&SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopStageStatus.getShopSubStageStatus())){ + shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(),stageList); } } return ApiResponse.success(Boolean.TRUE); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 56b967b7e..6ede7871e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -8,6 +8,7 @@ import com.cool.store.constants.DictConstants; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; import com.cool.store.dao.fees.WalletPayInfoDAO; +import com.cool.store.dao.order.PreAllocationRecordDAO; import com.cool.store.dto.ContractInformationDTO; import com.cool.store.dao.decoration.DecorationTeamConfigDAO; import com.cool.store.dao.decoration.ShopDecorationAssignDAO; @@ -20,6 +21,7 @@ import com.cool.store.entity.decoration.DecorationTeamConfigDO; import com.cool.store.entity.decoration.ShopDecorationAssignDO; import com.cool.store.entity.decoration.TeamAreaMappingDO; import com.cool.store.entity.fees.WalletPayInfoDO; +import com.cool.store.entity.order.PreAllocationRecordDO; import com.cool.store.enums.*; import com.cool.store.enums.Decoration.DecorationDescStatus; import com.cool.store.enums.fees.AllocationPayStatusEnum; @@ -168,6 +170,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu private WalletPayInfoDAO walletPayInfoDAO; @Resource private SignFranchiseService signFranchiseService; + @Resource + private PreAllocationRecordDAO preAllocationRecordDAO; @Override @@ -1009,6 +1013,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu .orElse(null); addSignFranchiseResponse.setPayDate(earliestPayTime); } + if(CollectionUtils.isNotEmpty(payInfoList)){ Set payNameSet = new HashSet<>(); List payTimeList = new ArrayList<>(); @@ -1064,6 +1069,16 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setCashierFee(franchiseFeeDO.getCashierFee()); addSignFranchiseResponse.setBigCashierFee(Convert.digitToChinese(convertToBig(franchiseFeeDO.getCashierFee()))); } + if (CollectionUtils.isEmpty(linePayList)){ + List preAllocationRecordDOS = preAllocationRecordDAO.queryPageByShopId(shopId); + List dateList = preAllocationRecordDOS.stream().map(PreAllocationRecordDO::getCreateTime).collect(Collectors.toList()); + Date earliestPayTime = dateList.stream().filter(Objects::nonNull) + .min(Comparator.naturalOrder()) + .orElse(null); + addSignFranchiseResponse.setPayDate(earliestPayTime); + addSignFranchiseResponse.setFirstYearStartTime(earliestPayTime); + addSignFranchiseResponse.setFirstYearEndTime(DateUtils.addDays(DateUtils.addYears(earliestPayTime,1),-1)); + } return addSignFranchiseResponse; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/order/MiniStoreOrderService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/order/MiniStoreOrderService.java index 91c21f798..e1386dca0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/order/MiniStoreOrderService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/order/MiniStoreOrderService.java @@ -1,6 +1,7 @@ package com.cool.store.service.order; import com.cool.store.context.LoginUserInfo; +import com.cool.store.entity.order.StoreOrderDO; import com.cool.store.request.order.*; import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.order.MiniStoreOrderDetailVO; @@ -44,7 +45,9 @@ public interface MiniStoreOrderService { List payList(Long shopId); - Boolean batchUpdateOptionQuantity(PCStoreOrderOptionQuantityUpdateRequest request); + Boolean managerOrder(PCStoreOrderOptionQuantityUpdateRequest request,LoginUserInfo userInfo); + + Boolean batchUpdateOptionQuantity(PCStoreOrderOptionQuantityUpdateRequest request,LoginUserInfo userInfo); Boolean saveOrUpdateWishlist(MiniStoreWishlistSaveRequest request, PartnerUserInfoVO userInfoVO); @@ -52,7 +55,7 @@ public interface MiniStoreOrderService { MiniStoreWishlistDetailVO wishlistDetail(Long wishlistId); - List wishlistList(PartnerUserInfoVO userInfoVO); + List wishlistList(Long lineId,Integer wishlistStatus); PageInfo wishAllList(WishAllListRequest request); @@ -61,4 +64,8 @@ public interface MiniStoreOrderService { Boolean wishlistApprove(WishlistAuditRequest request,LoginUserInfo userInfo); MiniStoreWishlistDetailVO getCurrentShopBindWishlist(Long shopId); + + Boolean changeWishlist(ChangeWishlistRequest request); + + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java index d1ed01fba..69485b73c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java @@ -34,6 +34,7 @@ import com.cool.store.entity.store.StoreTypeOptionDO; import com.cool.store.entity.wallet.WalletTradeDO; import com.cool.store.enums.*; import com.cool.store.enums.fees.AllocationPayStatusEnum; +import com.cool.store.enums.fees.PayTypeEnum; import com.cool.store.enums.fees.WalletFeeItemEnum; import com.cool.store.enums.order.StoreOrderStatusEnum; import com.cool.store.enums.order.WishlistStatusEnum; @@ -41,6 +42,7 @@ import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.enums.wallet.WalletTradeModuleEnum; import com.cool.store.exception.ServiceException; import com.cool.store.dto.wallet.BatchTransferDTO; +import com.cool.store.mapper.FranchiseFeeMapper; import com.cool.store.mapper.ShopAuditInfoMapper; import com.cool.store.request.PointRecommendLineRequest; import com.cool.store.request.SelectPointRequest; @@ -48,10 +50,8 @@ import com.cool.store.request.SysRoleRequest; import com.cool.store.request.order.*; import com.cool.store.request.dict.DictColumnQueryRequest; import com.cool.store.request.wallet.BatchTransferRequest; -import com.cool.store.service.OperationLogService; -import com.cool.store.service.PointService; -import com.cool.store.service.ShopService; -import com.cool.store.service.UserAuthMappingService; +import com.cool.store.request.xgj.PushFranchiseFeeRequest; +import com.cool.store.service.*; import com.cool.store.service.dict.DictColumnService; import com.cool.store.service.order.MiniStoreOrderService; import com.cool.store.service.store.PreAllocationRecordService; @@ -72,6 +72,7 @@ import com.cool.store.vo.order.WalletPayVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; import groovy.util.logging.Slf4j; import io.swagger.models.auth.In; import lombok.RequiredArgsConstructor; @@ -130,6 +131,9 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { private final PointService pointService; private final PointInfoDAO pointInfoDAO; private final ShopService shopService; + private final FranchiseFeeMapper franchiseFeeMapper; + private final PushService pushService; + private final StoreOrderOptionSnapshotDAO storeOrderOptionSnapshotDAO; @Override @@ -267,6 +271,7 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { .optionRemark(template.getOptionRemark()) .imageUrl(template.getImageUrl()) .optionUnit(template.getOptionUnit()) + .expenseTypeCode(template.getExpenseTypeCode()) .videoUrl(template.getVideoUrl()) .quantity(quantity) .amount(amount) @@ -342,15 +347,17 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { //阶段状态 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_281); - operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_280, user.getPartnerId(), user.getUsername(), - OperationTypeEnum.OPERATION_TYPE_0, "店型选购提交", OperationStatusEnum.PROCESSED); + if (user!=null){ + operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_280, user.getPartnerId(), user.getUsername(), + OperationTypeEnum.OPERATION_TYPE_0, "店型选购提交", OperationStatusEnum.PROCESSED); - SysRoleRequest sysRoleRequest = new SysRoleRequest(); - sysRoleRequest.setRoleName(AI_STORE_TYPE_APPROVE.getDesc()); - List userListByRole = userAuthMappingService.findUserListByRole(sysRoleRequest, false); - operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_281, - user.getPartnerId(), userListByRole, - OperationTypeEnum.OPERATION_TYPE_1, "店型选购待立规审批", OperationStatusEnum.NOT_PROCESSED, 1); + SysRoleRequest sysRoleRequest = new SysRoleRequest(); + sysRoleRequest.setRoleName(AI_STORE_TYPE_APPROVE.getDesc()); + List userListByRole = userAuthMappingService.findUserListByRole(sysRoleRequest, false); + operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_281, + user.getPartnerId(), userListByRole, + OperationTypeEnum.OPERATION_TYPE_1, "店型选购待立规审批", OperationStatusEnum.NOT_PROCESSED, 1); + } return order.getId(); } @@ -418,7 +425,11 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { LinkedHashMap::new, Collectors.toList()))); - List categoryVOList = new ArrayList<>(); + Set optinIdList = list.stream().map(StoreOrderOptionSnapshotDO::getOptionId).collect(Collectors.toSet()); + List storeTypeOptionDOS = storeTypeOptionDAO.selectByIds(new ArrayList<>(optinIdList),orderInfo.getStoreTypeId()); + + Map defaultQuantityMap = storeTypeOptionDOS.stream().collect(Collectors.toMap(StoreTypeOptionDO::getOptionId, StoreTypeOptionDO::getDefaultQuantity,(existing, replacement) -> existing)); + List categoryVOList = new ArrayList<>(); for (Map.Entry>> cEntry : groupMap.entrySet()) { String categoryCode = cEntry.getKey(); MiniStoreOrderDetailVO.CategoryVO cvo = new MiniStoreOrderDetailVO.CategoryVO(); @@ -444,6 +455,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { ovo.setAmount(v.getAmount()); ovo.setOriginalAmount(v.getOriginalAmount()); ovo.setImageUrl(v.getImageUrl()); + ovo.setExpenseTypeCode(v.getExpenseTypeCode()); + ovo.setDefaultQuantity(defaultQuantityMap.get(v.getOptionId())); return ovo; }) .collect(Collectors.toList()); @@ -585,10 +598,14 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { //修改阶段数据 shopStageInfoDAO.updateShopStageInfo(order.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_282); + //推送加盟费账单 + preAllocationRecordService.pushStandardStoreFee(order); } return Boolean.TRUE; } + + @Override @Transactional(rollbackFor = Exception.class) public Boolean rejectOrder(OrderAuditRecordRequest request,LoginUserInfo userInfo) { @@ -625,7 +642,11 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); shopAuditInfoDO.setResultType(resultType); - shopAuditInfoDO.setRejectReason(remark); + if (resultType==0){ + shopAuditInfoDO.setPassReason(remark); + }else { + shopAuditInfoDO.setRejectReason(remark); + } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); Long auditId = shopAuditInfoDO.getId(); List operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(shopId, stageStatusEnum, OperationTypeEnum.OPERATION_TYPE_1.getCode()); @@ -636,6 +657,7 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { @Override @Transactional public Long updateOrder(MiniStoreOrderUpdateRequest request,PartnerUserInfoVO user) { + log.info("updateOrder request:{},操作人:{}",JSONObject.toJSONString(request),user.getUsername()); if (request == null || request.getOrderId() == null || request.getShopId() == null || request.getStoreTypeId() == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } @@ -753,6 +775,7 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { .originalOptionPrice(originalPrice) .optionUnit(template.getOptionUnit()) .optionRemark(template.getOptionRemark()) + .expenseTypeCode(template.getExpenseTypeCode()) .imageUrl(template.getImageUrl()) .videoUrl(template.getVideoUrl()) .quantity(quantity) @@ -904,254 +927,254 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { @Override @Transactional public Boolean payOrder(MiniStoreOrderPayRequest request, PartnerUserInfoVO userInfo) { - log.info("订单开始支付 payOrder：{},userInfo:{}", JSONObject.toJSONString(request),JSONObject.toJSONString(userInfo)); - //重复支付校验 - String lockKey = MessageFormat.format(RedisConstant.STANDARD_STORE_PAY_LOCK_KEY, request.getOrderId()); - Boolean lock = redisUtil.tryLock(lockKey, lockKey, 10, TimeUnit.SECONDS); - if (!Boolean.TRUE.equals(lock)) { - throw new ServiceException(ErrorCodeEnum.DUPLICATE_PAYMENTS); - } - try { - // 1. 参数校验 - if (request == null || request.getOrderId() == null || request.getAmount() == null || - StringUtils.isBlank(request.getPayPwd())) { - throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); - } - - // 2. 查询订单信息 - StoreOrderDO order = storeOrderDAO.getById(request.getOrderId()); - if (order == null) { - throw new ServiceException(ErrorCodeEnum.STORE_ORDER_NOT_FOUND); - } - - // 3. 校验订单状态：仅待支付状态可以支付 - if (!StoreOrderStatusEnum.WAIT_PAY.getCode().equals(order.getStatus())) { - throw new ServiceException(ErrorCodeEnum.STORE_ORDER_STATUS_INVALID); - } - - // 4. 校验支付金额与订单金额是否一致 - if (request.getAmount().compareTo(order.getTotalAmount()) != 0) { - throw new ServiceException(ErrorCodeEnum.PAY_AMOUNT_ERROR); - } - - // 5. 查询门店信息 - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(order.getShopId()); - if (shopInfo == null) { - throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); - } - - // 6. 按门店查询预分账明细 - List allocationRecords = preAllocationRecordService.listDOByShop(order.getShopId()); - if (CollectionUtils.isEmpty(allocationRecords)) { - throw new ServiceException(ErrorCodeEnum.THERE_IS_NO_PAYMENT_INFORMATION); - } - - // 7. 校验预分账明细金额总和是否等于订单金额 - BigDecimal allocationTotal = allocationRecords.stream() - .filter(record -> record != null && record.getPayAmount() != null) - .map(PreAllocationRecordDO::getPayAmount) - .reduce(BigDecimal.ZERO, BigDecimal::add); - - if (allocationTotal.compareTo(order.getTotalAmount()) != 0) { - throw new ServiceException(ErrorCodeEnum.FEE_NOT_CONSISTENT); - } - - // 9. 封装批量分账请求 - BatchTransferRequest batchTransferRequest = new BatchTransferRequest(); - batchTransferRequest.setOutStoreId(shopInfo.getStoreId()); - batchTransferRequest.setPayPwd(request.getPayPwd()); - batchTransferRequest.setWalletType(2); - - List transArray = new ArrayList<>(); - for (PreAllocationRecordDO record : allocationRecords) { - BatchTransferRequest.TransDataRequest transData = new BatchTransferRequest.TransDataRequest(); - - // payNo 必须唯一且失败重试要沿用第一次的 payNo - String payNo = record.getPayNo(); - if (StringUtils.isBlank(payNo)) { - payNo = GenerateNoUtil.generateMillsNoWithRandom(); - record.setPayNo(payNo); - } - transData.setReqNo(payNo); - - // 根据费用类型获取费用科目ID - WalletFeeItemEnum feeItem = WalletFeeItemEnum.getByExpenseType(record.getExpenseType()); - if (feeItem == null) { - throw new ServiceException(ErrorCodeEnum.NONSUPPORT_EXPENSE_TYPE); - } - transData.setFeeItemId(feeItem.getFeeItemId()); - transData.setCompanyCode(record.getPayeeCode()); - transData.setAmount(record.getPayAmount().toString()); - - transArray.add(transData); - } - batchTransferRequest.setTransArray(transArray); - Map map = allocationRecords.stream().collect(Collectors.toMap(PreAllocationRecordDO::getPayNo, data -> data)); - - // 调用第三方前先固化 payNo（失败重试需要复用） - preAllocationRecordDAO.updateBatch(allocationRecords); - - // 10. 调用第三方分账接口 - BatchTransferDTO batchTransferResult; - try { - batchTransferResult = walletApiService.batchTransfer(batchTransferRequest); - } catch (Exception e) { - throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR.getCode(), "支付失败：" + e.getMessage()); - } - - // 11. 处理分账结果 - if (batchTransferResult == null || batchTransferResult.getTradeStatus() == null) { - throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR.getCode(), "支付失败：分账接口返回异常"); - } - - // 12. 根据分账结果更新状态和记录 - List walletPayInfoList = new ArrayList<>(); - List walletTradeList = new ArrayList<>(); - List updatedRecords = new ArrayList<>(); - - //批量支付状态 1.成功 2.失败 3.处理中（目前是实时转账 无处理中） - Integer tradeStatus = batchTransferResult.getTradeStatus(); - - // 订单状态 - Integer orderStatus = null; - - // 按批次结果全成/全败 - Integer allocationStatus; - Integer payStatus; - if (tradeStatus != null && tradeStatus == 1) { - allocationStatus = 1; - payStatus = AllocationPayStatusEnum.PAID.getStatus(); - orderStatus = StoreOrderStatusEnum.PAID.getCode(); - } else { - allocationStatus = 0; - payStatus = AllocationPayStatusEnum.FAIL.getStatus(); - orderStatus = PAY_FAIL.getCode(); - } - - // 无论成功失败，都需要落库，并更新预分账状态 - if (batchTransferResult.getTransArray() != null) { - for (int i = 0; i < batchTransferResult.getTransArray().size() && i < allocationRecords.size(); i++) { - BatchTransferDTO.TransDataRequest result = batchTransferResult.getTransArray().get(i); - PreAllocationRecordDO record = map.get(result.getReqNo()); - if (record == null) { - continue; - } - - record.setAllocationStatus(allocationStatus); - updatedRecords.add(record); - - WalletPayInfoDO walletPayInfo = new WalletPayInfoDO(); - walletPayInfo.setShopId(order.getShopId()); - walletPayInfo.setModule(STANDARD_STORE.getModule()); - walletPayInfo.setPayNo(result.getReqNo()); - walletPayInfo.setPayUserName(userInfo.getUsername()); - walletPayInfo.setPayAmount(new BigDecimal(result.getAmount())); - walletPayInfo.setPayStatus(payStatus); - walletPayInfo.setPayTime(new Date()); - walletPayInfo.setClaimStatus(ClaimStatusEnum.TO_BE_CLAIMED.getCode()); - walletPayInfo.setExpenseTypes(record.getExpenseType()); - walletPayInfo.setCreateTime(new Date()); - walletPayInfo.setTradeId(result.getTradeId()); - walletPayInfoList.add(walletPayInfo); - - WalletTradeDO walletTrade = new WalletTradeDO(); - walletTrade.setModule(STANDARD_STORE.getModule()); - walletTrade.setPayNo(result.getReqNo()); - walletTrade.setTradeId(result.getTradeId()); - walletTrade.setType(1); - walletTrade.setPayUserName(userInfo.getUsername()); - walletTrade.setPayAmount(new BigDecimal(result.getAmount())); - walletTrade.setPayStatus(payStatus); - walletTrade.setPayTime(new Date()); - walletTrade.setCreateTime(new Date()); - walletTradeList.add(walletTrade); - } - } - - // 13. 保存钱包支付信息/交易单：payNo 唯一索引，存在则更新，不存在则插入（批量处理） - List payNoList = walletPayInfoList.stream() - .map(WalletPayInfoDO::getPayNo) - .filter(StringUtils::isNotBlank) - .distinct() - .collect(Collectors.toList()); - - Set existPayNoSet = new HashSet<>(); - if (CollectionUtils.isNotEmpty(payNoList)) { - List existList = walletPayInfoDAO.getByPayNoList(payNoList); - if (CollectionUtils.isNotEmpty(existList)) { - existPayNoSet = existList.stream().map(WalletPayInfoDO::getPayNo).collect(Collectors.toSet()); - } - } - - List walletPayInfoInsertList = new ArrayList<>(); - List walletPayInfoUpdateList = new ArrayList<>(); - for (WalletPayInfoDO v : walletPayInfoList) { - if (v == null || StringUtils.isBlank(v.getPayNo())) { - continue; - } - if (existPayNoSet.contains(v.getPayNo())) { - walletPayInfoUpdateList.add(v); - } else { - walletPayInfoInsertList.add(v); - } - } - - if (CollectionUtils.isNotEmpty(walletPayInfoInsertList)) { - walletPayInfoDAO.insertBatch(walletPayInfoInsertList); - } - if (CollectionUtils.isNotEmpty(walletPayInfoUpdateList)) { - walletPayInfoDAO.updateBatchByPayNo(walletPayInfoUpdateList); - } - - // WalletTrade：同样按 payNo 分批新增/更新 - List walletTradeInsertList = new ArrayList<>(); - List walletTradeUpdateList = new ArrayList<>(); - for (WalletTradeDO v : walletTradeList) { - if (v == null || StringUtils.isBlank(v.getPayNo())) { - continue; - } - if (existPayNoSet.contains(v.getPayNo())) { - walletTradeUpdateList.add(v); - } else { - walletTradeInsertList.add(v); - } - } - - if (CollectionUtils.isNotEmpty(walletTradeInsertList)) { - walletTradeDAO.insertBatch(walletTradeInsertList); - } - if (CollectionUtils.isNotEmpty(walletTradeUpdateList)) { - walletTradeDAO.updateBatchByPayNo(walletTradeUpdateList); - } - - // 更新预分账明细 - if (CollectionUtils.isNotEmpty(updatedRecords)) { - preAllocationRecordDAO.updateBatch(updatedRecords); - } - - StoreOrderDO updateOrder = StoreOrderDO.builder() - .id(order.getId()) - .status(orderStatus) - .updateTime(new Date()) - .build(); - - if (batchTransferResult.getTradeStatus()==1) { - //支付成功 改订单下所有分账详情变为已分账 - preAllocationRecordDAO.updateBatch(allocationRecords); - //todo 推送数据到新管家？ - - shopStageInfoDAO.batchUpdateShopStageStatus(order.getShopId(),Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_80,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_285)); - - //支付成功 修改金额，支付中 回调的时候习惯 - updateOrder.setPaidAmount(order.getTotalAmount()); - updateOrder.setUnpaidAmount(BigDecimal.ZERO); - updateOrder.setPayTime(new Date()); - } - - storeOrderDAO.updateSelective(updateOrder); - }finally { - redisUtil.unlock(lockKey); - } +// log.info("订单开始支付 payOrder：{},userInfo:{}", JSONObject.toJSONString(request),JSONObject.toJSONString(userInfo)); +// //重复支付校验 +// String lockKey = MessageFormat.format(RedisConstant.STANDARD_STORE_PAY_LOCK_KEY, request.getOrderId()); +// Boolean lock = redisUtil.tryLock(lockKey, lockKey, 10, TimeUnit.SECONDS); +// if (!Boolean.TRUE.equals(lock)) { +// throw new ServiceException(ErrorCodeEnum.DUPLICATE_PAYMENTS); +// } +// try { +// // 1. 参数校验 +// if (request == null || request.getOrderId() == null || request.getAmount() == null || +// StringUtils.isBlank(request.getPayPwd())) { +// throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); +// } +// +// // 2. 查询订单信息 +// StoreOrderDO order = storeOrderDAO.getById(request.getOrderId()); +// if (order == null) { +// throw new ServiceException(ErrorCodeEnum.STORE_ORDER_NOT_FOUND); +// } +// +// // 3. 校验订单状态：仅待支付状态可以支付 +// if (!StoreOrderStatusEnum.WAIT_PAY.getCode().equals(order.getStatus())) { +// throw new ServiceException(ErrorCodeEnum.STORE_ORDER_STATUS_INVALID); +// } +// +// // 4. 校验支付金额与订单金额是否一致 +// if (request.getAmount().compareTo(order.getTotalAmount()) != 0) { +// throw new ServiceException(ErrorCodeEnum.PAY_AMOUNT_ERROR); +// } +// +// // 5. 查询门店信息 +// ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(order.getShopId()); +// if (shopInfo == null) { +// throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); +// } +// +// // 6. 按门店查询预分账明细 +// List allocationRecords = preAllocationRecordService.listDOByShop(order.getShopId()); +// if (CollectionUtils.isEmpty(allocationRecords)) { +// throw new ServiceException(ErrorCodeEnum.THERE_IS_NO_PAYMENT_INFORMATION); +// } +// +// // 7. 校验预分账明细金额总和是否等于订单金额 +// BigDecimal allocationTotal = allocationRecords.stream() +// .filter(record -> record != null && record.getPayAmount() != null) +// .map(PreAllocationRecordDO::getPayAmount) +// .reduce(BigDecimal.ZERO, BigDecimal::add); +// +// if (allocationTotal.compareTo(order.getTotalAmount()) != 0) { +// throw new ServiceException(ErrorCodeEnum.FEE_NOT_CONSISTENT); +// } +// +// // 9. 封装批量分账请求 +// BatchTransferRequest batchTransferRequest = new BatchTransferRequest(); +// batchTransferRequest.setOutStoreId(shopInfo.getStoreId()); +// batchTransferRequest.setPayPwd(request.getPayPwd()); +// batchTransferRequest.setWalletType(2); +// +// List transArray = new ArrayList<>(); +// for (PreAllocationRecordDO record : allocationRecords) { +// BatchTransferRequest.TransDataRequest transData = new BatchTransferRequest.TransDataRequest(); +// +// // payNo 必须唯一且失败重试要沿用第一次的 payNo +// String payNo = record.getPayNo(); +// if (StringUtils.isBlank(payNo)) { +// payNo = GenerateNoUtil.generateMillsNoWithRandom(); +// record.setPayNo(payNo); +// } +// transData.setReqNo(payNo); +// +// // 根据费用类型获取费用科目ID +// WalletFeeItemEnum feeItem = WalletFeeItemEnum.getByExpenseType(record.getExpenseType()); +// if (feeItem == null) { +// throw new ServiceException(ErrorCodeEnum.NONSUPPORT_EXPENSE_TYPE); +// } +// transData.setFeeItemId(feeItem.getFeeItemId()); +// transData.setCompanyCode(record.getPayeeCode()); +// transData.setAmount(record.getPayAmount().toString()); +// +// transArray.add(transData); +// } +// batchTransferRequest.setTransArray(transArray); +// Map map = allocationRecords.stream().collect(Collectors.toMap(PreAllocationRecordDO::getPayNo, data -> data)); +// +// // 调用第三方前先固化 payNo（失败重试需要复用） +// preAllocationRecordDAO.updateBatch(allocationRecords); +// +// // 10. 调用第三方分账接口 +// BatchTransferDTO batchTransferResult; +// try { +// batchTransferResult = walletApiService.batchTransfer(batchTransferRequest); +// } catch (Exception e) { +// throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR.getCode(), "支付失败：" + e.getMessage()); +// } +// +// // 11. 处理分账结果 +// if (batchTransferResult == null || batchTransferResult.getTradeStatus() == null) { +// throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR.getCode(), "支付失败：分账接口返回异常"); +// } +// +// // 12. 根据分账结果更新状态和记录 +// List walletPayInfoList = new ArrayList<>(); +// List walletTradeList = new ArrayList<>(); +// List updatedRecords = new ArrayList<>(); +// +// //批量支付状态 1.成功 2.失败 3.处理中（目前是实时转账 无处理中） +// Integer tradeStatus = batchTransferResult.getTradeStatus(); +// +// // 订单状态 +// Integer orderStatus = null; +// +// // 按批次结果全成/全败 +// Integer allocationStatus; +// Integer payStatus; +// if (tradeStatus != null && tradeStatus == 1) { +// allocationStatus = 1; +// payStatus = AllocationPayStatusEnum.PAID.getStatus(); +// orderStatus = StoreOrderStatusEnum.PAID.getCode(); +// } else { +// allocationStatus = 0; +// payStatus = AllocationPayStatusEnum.FAIL.getStatus(); +// orderStatus = PAY_FAIL.getCode(); +// } +// +// // 无论成功失败，都需要落库，并更新预分账状态 +// if (batchTransferResult.getTransArray() != null) { +// for (int i = 0; i < batchTransferResult.getTransArray().size() && i < allocationRecords.size(); i++) { +// BatchTransferDTO.TransDataRequest result = batchTransferResult.getTransArray().get(i); +// PreAllocationRecordDO record = map.get(result.getReqNo()); +// if (record == null) { +// continue; +// } +// +// record.setAllocationStatus(allocationStatus); +// updatedRecords.add(record); +// +// WalletPayInfoDO walletPayInfo = new WalletPayInfoDO(); +// walletPayInfo.setShopId(order.getShopId()); +// walletPayInfo.setModule(STANDARD_STORE.getModule()); +// walletPayInfo.setPayNo(result.getReqNo()); +// walletPayInfo.setPayUserName(userInfo.getUsername()); +// walletPayInfo.setPayAmount(new BigDecimal(result.getAmount())); +// walletPayInfo.setPayStatus(payStatus); +// walletPayInfo.setPayTime(new Date()); +// walletPayInfo.setClaimStatus(ClaimStatusEnum.TO_BE_CLAIMED.getCode()); +// walletPayInfo.setExpenseTypes(record.getExpenseType()); +// walletPayInfo.setCreateTime(new Date()); +// walletPayInfo.setTradeId(result.getTradeId()); +// walletPayInfoList.add(walletPayInfo); +// +// WalletTradeDO walletTrade = new WalletTradeDO(); +// walletTrade.setModule(STANDARD_STORE.getModule()); +// walletTrade.setPayNo(result.getReqNo()); +// walletTrade.setTradeId(result.getTradeId()); +// walletTrade.setType(1); +// walletTrade.setPayUserName(userInfo.getUsername()); +// walletTrade.setPayAmount(new BigDecimal(result.getAmount())); +// walletTrade.setPayStatus(payStatus); +// walletTrade.setPayTime(new Date()); +// walletTrade.setCreateTime(new Date()); +// walletTradeList.add(walletTrade); +// } +// } +// +// // 13. 保存钱包支付信息/交易单：payNo 唯一索引，存在则更新，不存在则插入（批量处理） +// List payNoList = walletPayInfoList.stream() +// .map(WalletPayInfoDO::getPayNo) +// .filter(StringUtils::isNotBlank) +// .distinct() +// .collect(Collectors.toList()); +// +// Set existPayNoSet = new HashSet<>(); +// if (CollectionUtils.isNotEmpty(payNoList)) { +// List existList = walletPayInfoDAO.getByPayNoList(payNoList); +// if (CollectionUtils.isNotEmpty(existList)) { +// existPayNoSet = existList.stream().map(WalletPayInfoDO::getPayNo).collect(Collectors.toSet()); +// } +// } +// +// List walletPayInfoInsertList = new ArrayList<>(); +// List walletPayInfoUpdateList = new ArrayList<>(); +// for (WalletPayInfoDO v : walletPayInfoList) { +// if (v == null || StringUtils.isBlank(v.getPayNo())) { +// continue; +// } +// if (existPayNoSet.contains(v.getPayNo())) { +// walletPayInfoUpdateList.add(v); +// } else { +// walletPayInfoInsertList.add(v); +// } +// } +// +// if (CollectionUtils.isNotEmpty(walletPayInfoInsertList)) { +// walletPayInfoDAO.insertBatch(walletPayInfoInsertList); +// } +// if (CollectionUtils.isNotEmpty(walletPayInfoUpdateList)) { +// walletPayInfoDAO.updateBatchByPayNo(walletPayInfoUpdateList); +// } +// +// // WalletTrade：同样按 payNo 分批新增/更新 +// List walletTradeInsertList = new ArrayList<>(); +// List walletTradeUpdateList = new ArrayList<>(); +// for (WalletTradeDO v : walletTradeList) { +// if (v == null || StringUtils.isBlank(v.getPayNo())) { +// continue; +// } +// if (existPayNoSet.contains(v.getPayNo())) { +// walletTradeUpdateList.add(v); +// } else { +// walletTradeInsertList.add(v); +// } +// } +// +// if (CollectionUtils.isNotEmpty(walletTradeInsertList)) { +// walletTradeDAO.insertBatch(walletTradeInsertList); +// } +// if (CollectionUtils.isNotEmpty(walletTradeUpdateList)) { +// walletTradeDAO.updateBatchByPayNo(walletTradeUpdateList); +// } +// +// // 更新预分账明细 +// if (CollectionUtils.isNotEmpty(updatedRecords)) { +// preAllocationRecordDAO.updateBatch(updatedRecords); +// } +// +// StoreOrderDO updateOrder = StoreOrderDO.builder() +// .id(order.getId()) +// .status(orderStatus) +// .updateTime(new Date()) +// .build(); +// +// if (batchTransferResult.getTradeStatus()==1) { +// //支付成功 改订单下所有分账详情变为已分账 +// preAllocationRecordDAO.updateBatch(allocationRecords); +// //todo 推送数据到新管家？ +// +// shopStageInfoDAO.batchUpdateShopStageStatus(order.getShopId(),Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_80,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_285)); +// +// //支付成功 修改金额，支付中 回调的时候习惯 +// updateOrder.setPaidAmount(order.getTotalAmount()); +// updateOrder.setUnpaidAmount(BigDecimal.ZERO); +// updateOrder.setPayTime(new Date()); +// } +// +// storeOrderDAO.updateSelective(updateOrder); +// }finally { +// redisUtil.unlock(lockKey); +// } return true; } @@ -1173,9 +1196,190 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { return walletPayVOS; } + @Override + public Boolean managerOrder(PCStoreOrderOptionQuantityUpdateRequest request, LoginUserInfo userInfo) { + log.info("managerOrder request:{},操作人:{}",JSONObject.toJSONString(request),userInfo.getName()); + if (request == null || request.getOrderId() == null ) { + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + + // 1. 查询原订单 + StoreOrderDO order = storeOrderDAO.getById(request.getOrderId()); + if (order == null || !order.getShopId().equals(order.getShopId())) { + throw new ServiceException(ErrorCodeEnum.STORE_ORDER_NOT_FOUND); + } + + // 2. 待立规审核 可管理订单 + Integer status = order.getStatus(); + if (!StoreOrderStatusEnum.WAIT_CONFIRM.getCode().equals(status)) { + throw new ServiceException(ErrorCodeEnum.STORE_ORDER_UPDATE_FORBIDDEN); + } + + // 3. 查询新店型信息 + StoreTypeDO storeType = storeTypeDAO.getById(order.getStoreTypeId()); + if (storeType == null || Boolean.TRUE.equals(storeType.getDeleted()) || + !Boolean.TRUE.equals(storeType.getActive())) { + throw new ServiceException(ErrorCodeEnum.CONFIG_NOT_EXIST); + } + + // 4. 获取新店型的选项绑定关系 + List bindings = storeTypeOptionDAO.listByStoreTypeId(order.getStoreTypeId()); + Map bindingMap = bindings.stream() + .collect(Collectors.toMap(StoreTypeOptionDO::getOptionId, Function.identity(), (a, b) -> a)); + + // 5. 处理选中的配置选项 + BigDecimal optionAmount = BigDecimal.ZERO; + BigDecimal originalOptionAmount = BigDecimal.ZERO; + List snapshotList = new ArrayList<>(); + + if (CollectionUtils.isNotEmpty(request.getSelectedOptions())) { + Set optionIds = request.getSelectedOptions().stream() + .filter(Objects::nonNull) + .map(PCStoreOrderOptionQuantityUpdateRequest.SelectedOption::getOptionId) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + + // 查询选项模板 + Map optionTemplateMap = new HashMap<>(); + if (!optionIds.isEmpty()) { + List optionTemplates = configOptionDAO.listActiveByIds(new ArrayList<>(optionIds)); + optionTemplateMap = optionTemplates.stream() + .collect(Collectors.toMap(ConfigOptionDO::getId, Function.identity(), (a, b) -> a)); + } + + // 校验并计算金额 + Set selectedItemCodes = new HashSet<>(); + for (PCStoreOrderOptionQuantityUpdateRequest.SelectedOption selected : request.getSelectedOptions()) { + if (selected == null || selected.getOptionId() == null) { + continue; + } + + StoreTypeOptionDO binding = bindingMap.get(selected.getOptionId()); + if (binding == null) { + throw new ServiceException(ErrorCodeEnum.THE_OPTION_IS_NOT_PART_OF_THIS_STORE_TYPE); + } + + ConfigOptionDO template = optionTemplateMap.get(selected.getOptionId()); + if (template == null || !Boolean.TRUE.equals(template.getActive())) { + throw new ServiceException(ErrorCodeEnum.CONFIG_NOT_EXIST); + } + + // 处理数量 + BigDecimal quantity = selected.getQuantity(); + + // 校验不可修改数量的选项 + BigDecimal defaultQty = binding.getDefaultQuantity(); + + + //使用店型上配置的价格 不能使用选项的配置上的价格 + BigDecimal price = binding.getOptionPrice() == null ? BigDecimal.ZERO : binding.getOptionPrice(); + BigDecimal originalPrice = template.getOriginalOptionPrice() == null ? BigDecimal.ZERO : template.getOriginalOptionPrice(); + + BigDecimal amount = BigDecimal.ZERO; + //小于默认数的时候 + if(quantity.compareTo(defaultQty)<=0){ + amount = price.multiply(quantity); + }else { + // 店型优惠价*默认数量 + 原价 *（选择数量-默认数量） + amount = price.multiply(defaultQty).add(originalPrice.multiply(quantity.subtract(defaultQty))); + } + BigDecimal originalAmount = originalPrice.multiply(quantity); + optionAmount = optionAmount.add(amount); + originalOptionAmount = originalOptionAmount.add(originalAmount); + + // 创建快照 + StoreOrderOptionSnapshotDO snapshot = StoreOrderOptionSnapshotDO.builder() + .orderId(order.getId()) + .shopId(order.getShopId()) + .storeTypeId(storeType.getId()) + .optionId(selected.getOptionId()) + .categoryCode(template.getCategoryCode()) + .itemCode(template.getItemCode()) + .optionCode(template.getOptionCode()) + .optionName(template.getOptionName()) + .optionPrice(price) + .originalOptionPrice(originalPrice) + .optionUnit(template.getOptionUnit()) + .optionRemark(template.getOptionRemark()) + .imageUrl(template.getImageUrl()) + .videoUrl(template.getVideoUrl()) + .quantity(quantity) + .expenseTypeCode(template.getExpenseTypeCode()) + .amount(amount) + .originalAmount(originalAmount) + .build(); + snapshotList.add(snapshot); + } + } + + // 6. 计算固定费用和总金额 + BigDecimal storeFixedAmount = safe(storeType.getFranchiseFee()) + .add(safe(storeType.getBrandUsageFee())) + .add(safe(storeType.getManagementFee())) + .add(safe(storeType.getSystemUsageFee())) + .add(safe(storeType.getDesignFee())) + .add(safe(storeType.getFirstOrderFee())) + .add(safe(storeType.getContractDeposit())); + + + BigDecimal originalStoreFixedAmount = safe(storeType.getOriginalFranchiseFee()) + .add(safe(storeType.getOriginalBrandUsageFee())) + .add(safe(storeType.getOriginalManagementFee())) + .add(safe(storeType.getOriginalSystemUsageFee())) + .add(safe(storeType.getOriginalDesignFee())) + .add(safe(storeType.getOriginalContractDeposit())); + + BigDecimal totalAmount = storeFixedAmount.add(optionAmount); + + BigDecimal originalTotalAmount = originalStoreFixedAmount.add(originalOptionAmount); + + // 7. 更新订单信息 + StoreOrderDO updateOrder = StoreOrderDO.builder() + .id(order.getId()) + .storeTypeId(storeType.getId()) + .storeTypeCode(storeType.getStoreTypeCode()) + .storeTypeName(storeType.getStoreTypeName()) + .storeType(storeType.getStoreType()) + .brand(storeType.getBrand()) + .franchiseFee(safe(storeType.getFranchiseFee())) + .originalFranchiseFee(safe(storeType.getOriginalFranchiseFee())) + .brandUsageFee(safe(storeType.getBrandUsageFee())) + .originalBrandUsageFee(safe(storeType.getOriginalBrandUsageFee())) + .managementFee(safe(storeType.getManagementFee())) + .originalManagementFee(safe(storeType.getOriginalManagementFee())) + .systemUsageFee(safe(storeType.getSystemUsageFee())) + .originalSystemUsageFee(safe(storeType.getOriginalSystemUsageFee())) + .contractDeposit(safe(storeType.getContractDeposit())) + .originalContractDeposit(safe(storeType.getOriginalContractDeposit())) + .designFee(safe(storeType.getDesignFee())) + .originalDesignFee(safe(storeType.getOriginalDesignFee())) + .firstOrderFee(safe(storeType.getFirstOrderFee())) + .storeFixedAmount(storeFixedAmount) + .originalStoreFixedAmount(originalStoreFixedAmount) + .optionAmount(optionAmount) + .originalOptionAmount(originalOptionAmount) + .totalAmount(totalAmount) + .originalTotalAmount(originalTotalAmount) + .unpaidAmount(totalAmount.subtract(order.getPaidAmount())) + .status(WAIT_CONFIRM.getCode()) + .updateTime(new Date()) + .build(); + + // 8. 删除旧快照并保存新快照 + snapshotDAO.deleteByOrderId(order.getId()); + if (!snapshotList.isEmpty()) { + snapshotDAO.insertBatch(snapshotList); + } + + // 9. 更新订单 + storeOrderDAO.updateSelective(updateOrder); + return Boolean.TRUE; + } + @Override @Transactional - public Boolean batchUpdateOptionQuantity(PCStoreOrderOptionQuantityUpdateRequest request) { + public Boolean batchUpdateOptionQuantity(PCStoreOrderOptionQuantityUpdateRequest request,LoginUserInfo userInfo) { + log.info("batchUpdateOptionQuantity request:{},操作人:{}",JSONObject.toJSONString(request),userInfo.getName()); if (request == null || request.getOrderId() == null || CollectionUtils.isEmpty(request.getSelectedOptions())) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } @@ -1407,11 +1611,11 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { } @Override - public List wishlistList( PartnerUserInfoVO userInfoVO) { - if (userInfoVO == null || userInfoVO.getLineId() == null) { + public List wishlistList( Long lineId,Integer wishlistStatus) { + if (lineId == null) { return Collections.emptyList(); } - List wishlistList = storeWishlistDAO.listByLineId(userInfoVO.getLineId(), null); + List wishlistList = storeWishlistDAO.listByLineId(lineId, null,wishlistStatus); if (CollectionUtils.isEmpty(wishlistList)) { return Collections.emptyList(); } @@ -1588,6 +1792,69 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { return convert(storelistDO); } + @Override + @Transactional + public Boolean changeWishlist(ChangeWishlistRequest request) { + if (request.getWishlistId()==null||request.getOrderId()==null||request.getShopId()==null){ + throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE); + } + //校验订单状态 + StoreOrderDO storeOrderDO = storeOrderDAO.getById(request.getOrderId()); + if (storeOrderDO==null){ + throw new ServiceException(ErrorCodeEnum.STORE_ORDER_NOT_FOUND); + } + if (!WAIT_CONFIRM.getCode().equals(storeOrderDO.getStatus())){ + throw new ServiceException(ErrorCodeEnum.CURRENT_ORDER_STATUS_NOT_SUPPORT_CHANGE); + } + MiniStoreWishlistDetailVO miniStoreWishlistDetailVO = wishlistDetail(request.getWishlistId()); + if (miniStoreWishlistDetailVO==null){ + throw new ServiceException(ErrorCodeEnum.CURRENT_WISHLIST_NOT_EXIST); + } + + //校验心愿单状态 + StoreWishlistDO wishlistDO = storeWishlistDAO.getById(request.getWishlistId()); + //校验心愿单是否绑定其他铺位 + if (!WishlistStatusEnum.COMPLETE_POINT.getCode().equals(wishlistDO.getWishlistStatus())){ + throw new ServiceException(ErrorCodeEnum.CURRENT_WISHLIST_BIND_OTHER_POINT); + } + + //查询老的心愿单 + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + if (shopInfo.getPointId()==null){ + throw new ServiceException(ErrorCodeEnum.ORDER_DATA_EXCEPTION); + } + //老的心愿单 + StoreWishlistDO oldWishlist = storeWishlistDAO.getByPointId(shopInfo.getLineId(), shopInfo.getPointId()); + //老的心愿单解绑关系 + storeWishlistDAO.unbindPoint(oldWishlist.getId()); + //新的心愿单关联关系 + wishlistDO.setPointId(shopInfo.getPointId()); + wishlistDO.setWishlistStatus(WishlistStatusEnum.PASS.getCode()); + storeWishlistDAO.updateByExampleSelective(wishlistDO); + + //删除老的订单 + storeOrderDAO.deleteById(storeOrderDO); + //删除快照 + storeOrderOptionSnapshotDAO.deleteByOrderId(storeOrderDO.getId()); + MiniStoreOrderCreateRequest miniStoreOrderCreateRequest = new MiniStoreOrderCreateRequest(); + miniStoreOrderCreateRequest.setStoreTypeId(miniStoreWishlistDetailVO.getStoreTypeId()); + miniStoreOrderCreateRequest.setShopId(request.getShopId()); + List selectedOptions = new ArrayList<>(); + + miniStoreWishlistDetailVO.getOptions().forEach(x->{ + MiniStoreOrderCreateRequest.SelectedOption selectedOption = new MiniStoreOrderCreateRequest.SelectedOption(); + selectedOption.setOptionId(x.getOptionId()); + selectedOption.setQuantity(x.getQuantity()); + selectedOptions.add(selectedOption); + }); + miniStoreOrderCreateRequest.setSelectedOptions(selectedOptions); + //创建订单 + createOrder(miniStoreOrderCreateRequest,null); + return Boolean.TRUE; + } + + + private MiniStoreWishlistDetailVO convert(StoreWishlistDO storeWishlistDO){ if (storeWishlistDO==null){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/store/PreAllocationRecordService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/store/PreAllocationRecordService.java index bbb18ca3f..f204f05be 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/store/PreAllocationRecordService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/store/PreAllocationRecordService.java @@ -1,6 +1,7 @@ package com.cool.store.service.store; import com.cool.store.entity.order.PreAllocationRecordDO; +import com.cool.store.entity.order.StoreOrderDO; import com.cool.store.request.store.PreAllocationQueryShopRequest; import com.cool.store.request.store.PreAllocationSaveRequest; import com.cool.store.vo.order.PreAllocationRecordVO; @@ -17,8 +18,12 @@ public interface PreAllocationRecordService { Boolean saveBatch(PreAllocationSaveRequest req); + void queryAndUpdateBatchTransferStatus(String batchCode); + List queryByShop(Long shopId); List listDOByShop(Long shopId); + Integer pushStandardStoreFee(StoreOrderDO storeOrderDO); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java index 712bbdb0c..b416c53cc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java @@ -1,40 +1,87 @@ package com.cool.store.service.store.impl; +import cn.hutool.core.collection.CollStreamUtil; +import com.alibaba.fastjson.JSONObject; +import com.cool.store.dao.FranchiseFeeDAO; +import com.cool.store.dao.LineInfoDAO; +import com.cool.store.dao.ShopInfoDAO; import com.cool.store.dao.ShopStageInfoDAO; +import com.cool.store.dao.fees.WalletAllocationConfigDAO; import com.cool.store.dao.fees.WalletPayInfoDAO; import com.cool.store.dao.order.PreAllocationRecordDAO; import com.cool.store.dao.order.StoreOrderDAO; +import com.cool.store.dao.order.StoreOrderOptionSnapshotDAO; +import com.cool.store.dao.wallet.WalletTradeDAO; +import com.cool.store.dto.fees.ExpenseTypeAmountDTO; +import com.cool.store.dto.fees.WalletAllocationDTO; +import com.cool.store.dto.wallet.AccountInfoDTO; +import com.cool.store.dto.wallet.BatchTransferDTO; +import com.cool.store.entity.FranchiseFeeDO; +import com.cool.store.entity.LineInfoDO; +import com.cool.store.entity.ShopInfoDO; +import com.cool.store.entity.ShopStageInfoDO; +import com.cool.store.entity.fees.ShopAllocationInfoDO; +import com.cool.store.entity.fees.WalletAllocationConfigDO; import com.cool.store.entity.fees.WalletPayInfoDO; import com.cool.store.entity.order.PreAllocationRecordDO; import com.cool.store.entity.order.StoreOrderDO; +import com.cool.store.entity.wallet.WalletTradeDO; +import com.cool.store.enums.ClaimStatusEnum; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.FranchiseBrandEnum; +import com.cool.store.enums.XGJCollectionStatusEnum; +import com.cool.store.enums.fees.AllocationPayStatusEnum; +import com.cool.store.enums.fees.PayTypeEnum; +import com.cool.store.enums.fees.WalletFeeItemEnum; import com.cool.store.enums.order.StoreOrderStatusEnum; +import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.FranchiseFeeMapper; import com.cool.store.request.store.PreAllocationSaveRequest; +import com.cool.store.request.wallet.BatchTransferQueryRequest; +import com.cool.store.request.wallet.BatchTransferRequest; +import com.cool.store.request.wallet.OutStoreIdRequest; +import com.cool.store.request.xgj.PushFranchiseFeeRequest; +import com.cool.store.request.xgj.ReceiptRequest; +import com.cool.store.service.PushService; import com.cool.store.service.dict.impl.DictService; +import com.cool.store.service.fees.WalletPayInfoService; +import com.cool.store.service.order.MiniStoreOrderService; import com.cool.store.service.store.PreAllocationRecordService; +import com.cool.store.service.wallet.WalletApiService; import com.cool.store.utils.BeanUtil; +import com.cool.store.utils.GenerateNoUtil; import com.cool.store.utils.RedisUtil; import com.cool.store.utils.StringUtil; +import com.cool.store.vo.order.MiniStoreOrderDetailVO; import com.cool.store.vo.order.PreAllocationRecordVO; +import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static com.cool.store.enums.order.StoreOrderStatusEnum.PAY_FAIL; +import static com.cool.store.enums.wallet.WalletTradeModuleEnum.STANDARD_STORE; /** * @Auther zx_szh * @Date 2026/2/4 15:56 * @Version 1.0 */ +@lombok.extern.slf4j.Slf4j @Service @RequiredArgsConstructor +@Slf4j public class PreAllocationRecordServiceImpl implements PreAllocationRecordService { private final PreAllocationRecordDAO dao; @@ -43,6 +90,19 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic private final StoreOrderDAO storeOrderDAO; private final ShopStageInfoDAO shopStageInfoDAO; private final WalletPayInfoDAO walletPayInfoDAO; + private final WalletAllocationConfigDAO walletAllocationConfigDAO; + private final StoreOrderOptionSnapshotDAO storeOrderOptionSnapshotDAO; + private final ShopInfoDAO shopInfoDAO; + private final WalletApiService walletApiService; + private final LineInfoDAO lineInfoDAO; + private final WalletTradeDAO walletTradeDAO; + private final PreAllocationRecordDAO preAllocationRecordDAO; + private final WalletPayInfoService walletPayInfoService; + private final PushService pushService; + private final FranchiseFeeDAO franchiseFeeDAO; + private final FranchiseFeeMapper franchiseFeeMapper; + + @Transactional @Override public Boolean saveBatch(PreAllocationSaveRequest req){ @@ -60,31 +120,98 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic } BigDecimal totalAmount = storeOrder.getTotalAmount() == null ? BigDecimal.ZERO : storeOrder.getTotalAmount(); - BigDecimal sumPayAmount = req.getItems() == null ? BigDecimal.ZERO : req.getItems().stream() - .filter(i -> i != null) - .map(i -> i.getPayAmount() == null ? BigDecimal.ZERO : i.getPayAmount()) + List existList = dao.queryPageByShopId(req.getShopId()); + Map existMap = existList.stream() + .filter(v -> v.getId() != null) + .collect(Collectors.toMap(PreAllocationRecordDO::getId, Function.identity(), (a, b) -> a)); + + List reqItems = req.getItems() == null ? Collections.emptyList() : req.getItems().stream().filter(item->BigDecimal.ZERO.compareTo(item.getPayAmount())<0).collect(Collectors.toList()); + Set reqIdSet = reqItems.stream() + .filter(Objects::nonNull) + .map(PreAllocationSaveRequest.PreAllocationItem::getId) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + + List insertList = new ArrayList<>(); + List updateList = new ArrayList<>(); + BigDecimal reqTouchedAmount = BigDecimal.ZERO; + + for (PreAllocationSaveRequest.PreAllocationItem item : reqItems) { + if (item == null) { + continue; + } + if (BigDecimal.ZERO.compareTo(item.getPayAmount())>=0){ + throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE); + } + Long id = item.getId(); + if (id == null) { + insertList.add(PreAllocationRecordDO.builder() + .orderId(req.getOrderId()) + .shopId(req.getShopId()) + .expenseType(item.getExpenseType()) + .payeeName(item.getPayeeName()) + .payeeCode(item.getPayeeCode()) + .payAmount(item.getPayAmount()) + .allocationStatus(AllocationPayStatusEnum.UNPAID.getStatus()) + .build()); + reqTouchedAmount = reqTouchedAmount.add(item.getPayAmount() == null ? BigDecimal.ZERO : item.getPayAmount()); + continue; + } + + PreAllocationRecordDO exist = existMap.get(id); + if (exist == null) { + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + if (!Objects.equals(exist.getShopId(), req.getShopId()) || !Objects.equals(exist.getOrderId(), req.getOrderId())) { + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + + //已支付 + if (Objects.equals(exist.getAllocationStatus(), 1)) { + reqTouchedAmount = reqTouchedAmount.add(exist.getPayAmount() == null ? BigDecimal.ZERO : exist.getPayAmount()); + continue; + } + + exist.setExpenseType(item.getExpenseType()); + exist.setPayeeName(item.getPayeeName()); + exist.setPayeeCode(item.getPayeeCode()); + exist.setPayAmount(item.getPayAmount()); + updateList.add(exist); + reqTouchedAmount = reqTouchedAmount.add(item.getPayAmount() == null ? BigDecimal.ZERO : item.getPayAmount()); + } + + List removedList = existList.stream() + .filter(v -> v != null && v.getId() != null && !reqIdSet.contains(v.getId())) + .collect(Collectors.toList()); + + BigDecimal paidRemovedAmount = removedList.stream() + .filter(v -> Objects.equals(v.getAllocationStatus(), AllocationPayStatusEnum.PAID.getStatus())) + .map(v -> v.getPayAmount() == null ? BigDecimal.ZERO : v.getPayAmount()) .reduce(BigDecimal.ZERO, BigDecimal::add); - //订单金额与分账金额对不上 抛出异常 - if (sumPayAmount.compareTo(totalAmount) != 0) { + + BigDecimal finalAmount = reqTouchedAmount.add(paidRemovedAmount); + if (finalAmount.compareTo(totalAmount) != 0) { throw new ServiceException(ErrorCodeEnum.FEE_NOT_CONSISTENT); } - dao.deleteByShopId(req.getShopId()); - List list = req.getItems().stream().map(i -> - PreAllocationRecordDO.builder() - .orderId(req.getOrderId()) - .shopId(req.getShopId()) - .expenseType(i.getExpenseType()) - .payeeName(i.getPayeeName()) - .payeeCode(i.getPayeeCode()) - .payAmount(i.getPayAmount()) - .allocationStatus(0) - .build() - ).collect(Collectors.toList()); - dao.insertBatch(list); - shopStageInfoDAO.updateShopStageInfo(req.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_284); - storeOrder.setStatus(StoreOrderStatusEnum.WAIT_PAY.getCode()); - storeOrderDAO.updateSelective(storeOrder); + if (CollectionUtils.isNotEmpty(updateList)) { + dao.batchUpdateEditableFields(updateList); + } + if (CollectionUtils.isNotEmpty(insertList)) { + dao.insertBatch(insertList); + } + + List removeIds = removedList.stream() + .filter(v -> !Objects.equals(v.getAllocationStatus(), AllocationPayStatusEnum.PAID.getStatus())) + .map(PreAllocationRecordDO::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(removeIds)) { + dao.deleteByIdsNotPaid(removeIds); + } + + //分账 + batchTrans(req,storeOrder); return Boolean.TRUE; }finally{ redisUtil.unlock(lockKey); @@ -92,11 +219,382 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic } + @Transactional + public void batchTrans(PreAllocationSaveRequest req,StoreOrderDO storeOrder){ + log.info("batchTrans:{}", JSONObject.toJSONString(req)); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(storeOrder.getLineId()); + //分账 + List walletFeeItemBySubStage = WalletFeeItemEnum.getWalletFeeItemBySubStage(req.getSubStage()); + List newAllocationList = dao.queryPageByShopId(req.getShopId()); + //待分账数据 + List list = newAllocationList.stream(). + filter(x -> x.getExpenseType() != null && walletFeeItemBySubStage.contains(x.getExpenseType()) && x.getAllocationStatus() == AllocationPayStatusEnum.UNPAID.getStatus() + ).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(list)){ + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(storeOrder.getShopId()); + BatchTransferRequest batchTransferRequest = new BatchTransferRequest(); + batchTransferRequest.setOutStoreId(shopInfo.getStoreId()); + batchTransferRequest.setVerifyPassword(1); + batchTransferRequest.setWalletType(2); + + List transArray = new ArrayList<>(); + // + BigDecimal currentAmount = new BigDecimal("0"); + for (PreAllocationRecordDO record : list) { + BatchTransferRequest.TransDataRequest transData = new BatchTransferRequest.TransDataRequest(); + + // payNo 必须唯一且失败重试要沿用第一次的 payNo + String payNo = record.getPayNo(); + if (StringUtils.isBlank(payNo)) { + payNo = GenerateNoUtil.generateMillsNoWithRandom(); + record.setPayNo(payNo); + } + transData.setReqNo(payNo); + + // 根据费用类型获取费用科目ID + WalletFeeItemEnum feeItem = WalletFeeItemEnum.getByExpenseType(record.getExpenseType()); + if (feeItem == null) { + throw new ServiceException(ErrorCodeEnum.NONSUPPORT_EXPENSE_TYPE); + } + transData.setFeeItemId(feeItem.getFeeItemId()); + transData.setCompanyCode(record.getPayeeCode()); + transData.setAmount(record.getPayAmount().toString()); + + currentAmount = currentAmount.add(record.getPayAmount()); + + transArray.add(transData); + } + + if (StringUtil.isNotEmpty(shopInfo.getStoreId())){ + List accountInfo = walletApiService.getAccountInfo(new OutStoreIdRequest(shopInfo.getStoreId())); + if (CollectionUtils.isNotEmpty(accountInfo)){ + AccountInfoDTO accountInfoDTO = accountInfo.get(0); + String totalAmount = accountInfoDTO.getTotalAmount(); + BigDecimal total = new BigDecimal(totalAmount); + //校验本次缴纳金额 + if (total.compareTo(currentAmount)<0) { + throw new ServiceException(ErrorCodeEnum.NOT_ENOUGH_BALANCE); + } + //首次缴款 校验总金额 + if (req.getSubStage()==ShopSubStageEnum.SHOP_STAGE_28.getShopSubStage()){ + if (total.compareTo(storeOrder.getTotalAmount())<0) { + throw new ServiceException(ErrorCodeEnum.NOT_ENOUGH_BALANCE); + } + } + + } + } + + batchTransferRequest.setTransArray(transArray); + Map map = list.stream().collect(Collectors.toMap(PreAllocationRecordDO::getPayNo, data -> data)); + //// 调用第三方前先固化 payNo（失败重试需要复用） + preAllocationRecordDAO.updateBatch(list); + BatchTransferDTO batchTransferResult; + try { + batchTransferResult = walletApiService.batchTransfer(batchTransferRequest); + } catch (Exception e) { + throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR.getCode(), "支付失败：" + e.getMessage()); + } + // 11. 处理分账结果 + if (batchTransferResult == null || batchTransferResult.getTradeStatus() == null) { + throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR.getCode(), "支付失败：分账接口返回异常"); + } + + List walletPayInfoList = new ArrayList<>(); + List walletTradeList = new ArrayList<>(); + List updatedRecords = new ArrayList<>(); + + //批量支付状态 1.成功 2.失败 3.处理中（网商银行有处理中） + Integer tradeStatus = batchTransferResult.getTradeStatus(); + + // 订单状态 + Integer orderStatus = null; + + // 按批次结果全成/全败 + Integer allocationStatus = tradeStatus; + if (tradeStatus != null && tradeStatus == 1) { + orderStatus = StoreOrderStatusEnum.PART_OF_WAIT_PAY.getCode(); + } + + // 无论成功失败，都需要落库，并更新预分账状态 + if (batchTransferResult.getTransArray() != null) { + for (int i = 0; i < batchTransferResult.getTransArray().size() && i < list.size(); i++) { + BatchTransferDTO.TransDataRequest result = batchTransferResult.getTransArray().get(i); + PreAllocationRecordDO record = map.get(result.getReqNo()); + if (record == null) { + continue; + } + + record.setAllocationStatus(allocationStatus); + updatedRecords.add(record); + + WalletPayInfoDO walletPayInfo = new WalletPayInfoDO(); + walletPayInfo.setShopId(storeOrder.getShopId()); + walletPayInfo.setModule(STANDARD_STORE.getModule()); + walletPayInfo.setPayNo(result.getReqNo()); + walletPayInfo.setPayUserName(lineInfo.getUsername()); + walletPayInfo.setPayAmount(new BigDecimal(result.getAmount())); + walletPayInfo.setPayStatus(tradeStatus); + walletPayInfo.setPayTime(new Date()); + walletPayInfo.setClaimStatus(ClaimStatusEnum.TO_BE_CLAIMED.getCode()); + walletPayInfo.setExpenseTypes(record.getExpenseType()); + walletPayInfo.setCreateTime(new Date()); + walletPayInfo.setTradeId(result.getTradeId()); + walletPayInfo.setBatchCode(batchTransferResult.getBatchCode()); + walletPayInfoList.add(walletPayInfo); + + WalletTradeDO walletTrade = new WalletTradeDO(); + walletTrade.setModule(STANDARD_STORE.getModule()); + walletTrade.setPayNo(result.getReqNo()); + walletTrade.setTradeId(result.getTradeId()); + walletTrade.setType(1); + walletTrade.setPayUserName(lineInfo.getUsername()); + walletTrade.setPayAmount(new BigDecimal(result.getAmount())); + walletTrade.setPayStatus(tradeStatus); + walletTrade.setPayTime(new Date()); + walletTrade.setBatchCode(batchTransferResult.getBatchCode()); + walletTrade.setCreateTime(new Date()); + walletTradeList.add(walletTrade); + } + } + + // 13. 保存钱包支付信息/交易单：payNo 唯一索引，存在则更新，不存在则插入（批量处理） + List payNoList = walletPayInfoList.stream() + .map(WalletPayInfoDO::getPayNo) + .filter(StringUtils::isNotBlank) + .distinct() + .collect(Collectors.toList()); + + Set existPayNoSet = new HashSet<>(); + if (CollectionUtils.isNotEmpty(payNoList)) { + List existList = walletPayInfoDAO.getByPayNoList(payNoList); + if (CollectionUtils.isNotEmpty(existList)) { + existPayNoSet = existList.stream().map(WalletPayInfoDO::getPayNo).collect(Collectors.toSet()); + } + } + + List walletPayInfoInsertList = new ArrayList<>(); + List walletPayInfoUpdateList = new ArrayList<>(); + for (WalletPayInfoDO v : walletPayInfoList) { + if (v == null || StringUtils.isBlank(v.getPayNo())) { + continue; + } + if (existPayNoSet.contains(v.getPayNo())) { + walletPayInfoUpdateList.add(v); + } else { + walletPayInfoInsertList.add(v); + } + } + + if (CollectionUtils.isNotEmpty(walletPayInfoInsertList)) { + walletPayInfoDAO.insertBatch(walletPayInfoInsertList); + } + if (CollectionUtils.isNotEmpty(walletPayInfoUpdateList)) { + walletPayInfoDAO.updateBatchByPayNo(walletPayInfoUpdateList); + } + + // WalletTrade：同样按 payNo 分批新增/更新 + List walletTradeInsertList = new ArrayList<>(); + List walletTradeUpdateList = new ArrayList<>(); + for (WalletTradeDO v : walletTradeList) { + if (v == null || StringUtils.isBlank(v.getPayNo())) { + continue; + } + if (existPayNoSet.contains(v.getPayNo())) { + walletTradeUpdateList.add(v); + } else { + walletTradeInsertList.add(v); + } + } + + if (CollectionUtils.isNotEmpty(walletTradeInsertList)) { + walletTradeDAO.insertBatch(walletTradeInsertList); + } + if (CollectionUtils.isNotEmpty(walletTradeUpdateList)) { + walletTradeDAO.updateBatchByPayNo(walletTradeUpdateList); + } + + // 更新预分账明细 + if (CollectionUtils.isNotEmpty(updatedRecords)) { + preAllocationRecordDAO.updateBatch(updatedRecords); + } + + StoreOrderDO updateOrder = StoreOrderDO.builder() + .id(storeOrder.getId()) + .status(orderStatus) + .updateTime(new Date()) + .build(); + + if (batchTransferResult.getTradeStatus()==1) { + List walletPayInfoDOS = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(walletPayInfoInsertList)){ + walletPayInfoDOS.addAll(walletPayInfoInsertList); + } + if (CollectionUtils.isNotEmpty(walletPayInfoUpdateList)){ + walletPayInfoDOS.addAll(walletPayInfoUpdateList); + } + this.pushReceiptRequest(walletPayInfoUpdateList,shopInfo,storeOrder); + + //对账中 + shopStageInfoDAO.batchUpdateShopStageStatus(storeOrder.getShopId(),Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_284_5)); + + //当前缴纳金额 = 本次缴纳前已缴纳金额+本次缴纳金额 + BigDecimal paidAmount = storeOrder.getPaidAmount().add(currentAmount); + BigDecimal unpaidAmount = storeOrder.getTotalAmount().subtract(paidAmount); + //支付成功 修改金额，支付中 回调的时候习惯 + updateOrder.setPaidAmount(paidAmount); + updateOrder.setUnpaidAmount(unpaidAmount); + updateOrder.setPayTime(new Date()); + if (unpaidAmount.compareTo(new BigDecimal(0))==0){ + //剩余缴纳金额是0 缴费完成 + updateOrder.setStatus( StoreOrderStatusEnum.PAID.getCode()); + } + } + storeOrderDAO.updateSelective(updateOrder); + } + } + + private void pushReceiptRequest(List payInfoList, ShopInfoDO shopInfoDO,StoreOrderDO storeOrder) { + if (CollectionUtils.isEmpty(payInfoList)) { + return; + } + FranchiseFeeDO franchiseFeeDO = franchiseFeeDAO.selectByShopId(shopInfoDO.getId()); + Integer feeId = null; + if (Objects.isNull(franchiseFeeDO)){ + feeId = this.pushStandardStoreFee(storeOrder); + }else { + feeId = franchiseFeeDO.getId().intValue(); + } + for (WalletPayInfoDO payInfo : payInfoList) { + ReceiptRequest receiptRequest = new ReceiptRequest(shopInfoDO.getId(), feeId, payInfo, Integer.valueOf(shopInfoDO.getFranchiseBrand())); + try { + pushService.pushReceiptToXGJ(receiptRequest); + } catch (Exception e) { + log.error("钱包账单推送新管家失败, walletPayInfoId:{}", payInfo.getId(), e); + } + } + } + + @Override + @Transactional + public void queryAndUpdateBatchTransferStatus(String batchCode) { + BatchTransferDTO batchTransferDTO = walletApiService.queryBatchTransfer(new BatchTransferQueryRequest(batchCode)); + // 根据批次号更新交易单 + walletTradeDAO.updatePayStatusByBatchCode(batchCode, batchTransferDTO.getTradeStatus()); + // 根据批次号更新业务单 + List payInfoList = walletPayInfoDAO.getByBatchCode(batchCode); + if (CollectionUtils.isEmpty(payInfoList)) { + log.error("查询并更新批量转账状态异常，业务单为空"); + return; + } + walletPayInfoDAO.updatePayStatusByBatchCode(batchCode, batchTransferDTO.getTradeStatus()); + // 更新分账信息 + Long shopId = payInfoList.get(0).getShopId(); + List payNoList = batchTransferDTO.getTransArray().stream().map(BatchTransferDTO.TransDataRequest::getReqNo).collect(Collectors.toList()); + //分账状态调整 + preAllocationRecordDAO.updateByPayNoList(payNoList,batchTransferDTO.getTradeStatus()); + // 校验并流转流程 + if (AllocationPayStatusEnum.PAID.getStatus().equals(batchTransferDTO.getTradeStatus())) { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + // 校验并流转流程 + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_284_5); + //订单状态更新 + + StoreOrderDO storeOrder = storeOrderDAO.getLatestOrderByShopId(shopId); + //部分支付 + StoreOrderDO updateOrder = StoreOrderDO.builder() + .id(storeOrder.getId()) + .status(StoreOrderStatusEnum.PART_OF_WAIT_PAY.getCode()) + .updateTime(new Date()) + .build(); + //当前缴纳金额 = 本次缴纳前已缴纳金额+本次缴纳金额 + BigDecimal currentAmount = sumAmount(payInfoList); + BigDecimal paidAmount = storeOrder.getPaidAmount().add(currentAmount); + BigDecimal unpaidAmount = storeOrder.getTotalAmount().subtract(paidAmount); + //支付成功 修改金额，支付中 回调的时候习惯 + updateOrder.setPaidAmount(paidAmount); + updateOrder.setUnpaidAmount(unpaidAmount); + updateOrder.setPayTime(new Date()); + if (unpaidAmount.compareTo(new BigDecimal(0))==0){ + //剩余缴纳金额是0 缴费完成 + updateOrder.setStatus( StoreOrderStatusEnum.PAID.getCode()); + } + storeOrderDAO.updateSelective(updateOrder); + // 推送缴费单数据到新管家 + if (CollectionUtils.isNotEmpty(payInfoList)) { + pushReceiptRequest(payInfoList, shopInfo,storeOrder); + } + + } + + } + @Override public List queryByShop(Long shopId){ List list = dao.queryPageByShopId(shopId); - if (CollectionUtils.isEmpty(list)){ - return new ArrayList<>(); + if (CollectionUtils.isEmpty(list)) { + StoreOrderDO storeOrder = storeOrderDAO.getLatestOrderByShopId(shopId); + if (storeOrder == null) { + return new ArrayList<>(); + } + + // 获取基础费用类型配置 + List baseExpenseTypeList = WalletFeeItemEnum.getBaseExpenseType().stream() + .map(WalletFeeItemEnum::getExpenseType) + .collect(Collectors.toList()); + + // 获取费用配置映射 + Map allocationConfigMap = walletAllocationConfigDAO + .selectByExpenseTypeList(FranchiseBrandEnum.ZXJP.getCode(), null) + .stream() + .collect(Collectors.toMap(WalletAllocationDTO::getExpenseType, Function.identity())); + + // 获取订单实际费用明细 + List actualExpenseList = storeOrderOptionSnapshotDAO + .getExpenseTypeAmountByOrderId(storeOrder.getId()); + + // 构建已存在的费用类型集合 + Set processedExpenseTypes = new HashSet<>(); + // 构建结果集 + List result = new ArrayList<>(); + + // 处理实际费用明细 + for (ExpenseTypeAmountDTO expense : actualExpenseList) { + String expenseType = expense.getExpenseType(); + BigDecimal payAmount; + + if (processedExpenseTypes.contains(expenseType)) { + // 重复的费用类型，金额设为0 + payAmount = BigDecimal.ZERO; + } else { + payAmount = expense.getTotalAmount(); + processedExpenseTypes.add(expenseType); + } + + PreAllocationRecordVO record = buildPreAllocationRecord( + storeOrder, shopId, expenseType, payAmount, allocationConfigMap); + result.add(record); + } + + // 处理配置中但订单中没有的费用 + for (String expenseType : baseExpenseTypeList) { + + // 如果已经处理过，金额设为0（继续添加） + if (processedExpenseTypes.contains(expenseType)) { + PreAllocationRecordVO record = buildPreAllocationRecord( + storeOrder, shopId, expenseType, BigDecimal.ZERO, allocationConfigMap); + result.add(record); + continue; + } + + // 未处理过的，从订单中获取金额 + BigDecimal amount = getAmountFromOrderByExpenseType(storeOrder, expenseType); + PreAllocationRecordVO record = buildPreAllocationRecord( + storeOrder, shopId, expenseType, amount, allocationConfigMap); + result.add(record); + processedExpenseTypes.add(expenseType); + } + return result; } List payNoList = list.stream().filter(x-> StringUtil.isNotEmpty(x.getPayNo())).map(PreAllocationRecordDO::getPayNo).collect(Collectors.toList()); Map map = new HashMap<>(); @@ -116,10 +614,101 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic return preAllocationRecordVOS; } + + + + /** + * 构建预分配记录 + */ + private PreAllocationRecordVO buildPreAllocationRecord( + StoreOrderDO storeOrder, Long shopId, String expenseType, + BigDecimal payAmount, Map allocationConfigMap) { + + PreAllocationRecordVO record = new PreAllocationRecordVO(); + record.setShopId(shopId); + record.setOrderId(storeOrder.getId()); + record.setExpenseType(expenseType); + record.setExpenseTypeName(WalletFeeItemEnum.getByExpenseTypeName(expenseType)); + record.setPayAmount(payAmount); + record.setClaimStatus(ClaimStatusEnum.TO_BE_CLAIMED.getCode()); + record.setAllocationStatus(AllocationPayStatusEnum.UNPAID.getStatus()); + + // 设置收款方信息 + WalletAllocationDTO allocation = allocationConfigMap.get(expenseType); + if (allocation != null) { + record.setPayeeName(allocation.getPayeeName()); + record.setPayeeCode(allocation.getPayeeCode()); + } + dictService.fillDictField(record); + + return record; + } + + /** + * 根据费用类型从订单中获取金额 + */ + private BigDecimal getAmountFromOrderByExpenseType(StoreOrderDO storeOrder, String expenseType) { + if (WalletFeeItemEnum.FRANCHISE_FEE.getExpenseType().equals(expenseType)) { + return storeOrder.getFranchiseFee(); + } + if (WalletFeeItemEnum.MANAGEMENT_FEE.getExpenseType().equals(expenseType)) { + return storeOrder.getManagementFee(); + } + if (WalletFeeItemEnum.BRAND_USAGE_FEE.getExpenseType().equals(expenseType)) { + return storeOrder.getBrandUsageFee(); + } + if (WalletFeeItemEnum.DESIGN_FEE_GROUP.getExpenseType().equals(expenseType)) { + return storeOrder.getDesignFee(); + } + if (WalletFeeItemEnum.EARNEST_MONEY.getExpenseType().equals(expenseType)) { + return storeOrder.getContractDeposit(); + } + return BigDecimal.ZERO; + } + + public BigDecimal sumAmount(List list) { + if (list == null || list.isEmpty()) { + return BigDecimal.ZERO; + } + + // 方法1：使用 map 和 reduce + return list.stream() + .map(WalletPayInfoDO::getPayAmount) + .filter(Objects::nonNull) + .reduce(BigDecimal.ZERO, BigDecimal::add); + } @Override public List listDOByShop(Long shopId) { return dao.queryPageByShopId(shopId); } + @Override + public Integer pushStandardStoreFee(StoreOrderDO order) { + FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO(); + franchiseFeeDO.setXgjCollectionStatus(XGJCollectionStatusEnum.WAIT_PAY.getCode()); + franchiseFeeDO.setCreateTime(new Date()); + franchiseFeeDO.setShopId(order.getShopId()); + //加盟费 + franchiseFeeDO.setYearFranchiseFee(order.getFranchiseFee().stripTrailingZeros().toPlainString()); + //保证金 + franchiseFeeDO.setLoanMargin(order.getContractDeposit().stripTrailingZeros().toPlainString()); + //品牌使用费 + franchiseFeeDO.setFirstYearFee(order.getBrandUsageFee().stripTrailingZeros().toPlainString()); + //管理费 + franchiseFeeDO.setFirstYearManageFee(order.getManagementFee().stripTrailingZeros().toPlainString()); + //设计费 + franchiseFeeDO.setPerformanceBond(order.getDesignFee().stripTrailingZeros().toPlainString()); + franchiseFeeDO.setDiscountReason("标准AI店优惠"); + //系统使用费 + franchiseFeeDO.setCashierFee(order.getSystemUsageFee().stripTrailingZeros().toPlainString()); + franchiseFeeDO.setPayType(PayTypeEnum.PING_AN.getType()); + Integer feeId = franchiseFeeMapper.insertSelective(franchiseFeeDO); + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(order.getShopId()); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfo.getUsername(), franchiseFeeDO,Integer.valueOf(shopInfoDO.getFranchiseBrand())); + feeRequest.setJoinBrand(Integer.valueOf(shopInfoDO.getFranchiseBrand())); + pushService.pushFranchiseFeeToXGJ(feeRequest); + return feeId; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index 664b7986a..c6a58ae02 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -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 franchiseFeePayInfoByShopId = linePayDAO.getFranchiseFeePayInfoByShopId(x.getShopId()); franchiseFeePayInfoByShopId.forEach(y->{ diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/StoreOrderController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/StoreOrderController.java index 6cd93f4ef..93355cb2e 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/StoreOrderController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/StoreOrderController.java @@ -31,13 +31,13 @@ public class StoreOrderController { private final MiniStoreOrderService miniStoreOrderService; - @ApiOperation("订单 审批拒绝") + @ApiOperation("订单 立规确认 加盟商确认") @PostMapping("/passOrder") public ResponseResult passOrder(@RequestBody OrderAuditRecordRequest request) { return ResponseResult.success(miniStoreOrderService.passOrder(request, CurrentUserHolder.getUser())); } - @ApiOperation("订单 审批通过") + @ApiOperation("订单 审批拒绝 废弃") @PostMapping("/rejectOrder") public ResponseResult 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 batchUpdateOptionQuantity(@RequestBody @Valid PCStoreOrderOptionQuantityUpdateRequest request) { - return ResponseResult.success(miniStoreOrderService.batchUpdateOptionQuantity(request)); + return ResponseResult.success(miniStoreOrderService.batchUpdateOptionQuantity(request,CurrentUserHolder.getUser())); } + @ApiOperation("管理订单-可调整选项(编辑选配)") + @PostMapping("/managerOrder") + public ResponseResult managerOrder(@RequestBody @Valid PCStoreOrderOptionQuantityUpdateRequest request) { + return ResponseResult.success(miniStoreOrderService.managerOrder(request,CurrentUserHolder.getUser())); + } + + @ApiOperation("更换心愿单列表-PC") + @GetMapping("/wishlist/list") + public ResponseResult> 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 wishlistList(@RequestBody ChangeWishlistRequest request) { + return ResponseResult.success(miniStoreOrderService.changeWishlist(request)); + } + + @ApiOperation("心愿单详情") @GetMapping("/wishlist/detail") public ResponseResult wishlistDetail(@RequestParam("wishlistId") Long wishlistId) { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniStoreOrderController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniStoreOrderController.java index 1e8b25b39..d56d5b86a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniStoreOrderController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniStoreOrderController.java @@ -110,7 +110,7 @@ public class MiniStoreOrderController { @ApiOperation("心愿单列表") @GetMapping("/wishlist/list") public ResponseResult> wishlistList() { - return ResponseResult.success(miniStoreOrderService.wishlistList( PartnerUserHolder.getUser())); + return ResponseResult.success(miniStoreOrderService.wishlistList( PartnerUserHolder.getUser().getLineId(),null)); } @ApiOperation("心愿单绑定铺位") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 8229318ab..88de25df5 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -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 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------"); + } }