diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/callback/EasyLearnCallBackController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/callback/EasyLearnCallBackController.java index adc0fb2..d282c83 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/callback/EasyLearnCallBackController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/callback/EasyLearnCallBackController.java @@ -35,16 +35,4 @@ public class EasyLearnCallBackController { return WxPayNotifyResponse.success("成功"); } - /** - * 微信支付分账通知 - * @author DB - * @since 2023/10/27 16:04 - * @param xmlData 数据 - * @return java.lang.String - */ - @PostMapping("/notify/profitSharing") - public String parseProfitSharingNotifyResult(@RequestBody String xmlData){ - easyLearnOrderService.parseProfitSharingNotifyResult(xmlData); - return WxPayNotifyResponse.success("成功"); - } } diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java index 73f253b..4aa6a2b 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java @@ -44,14 +44,6 @@ public interface EasyLearnOrderService extends IService { */ void wxPayNotifyOrder(String xmlData); - /** - * 微信支付分账通知 - * @author DB - * @since 2023/12/21 - * @param xmlData 数据 - */ - void parseProfitSharingNotifyResult(String xmlData); - /** * 一次性支付下单 * @author DB diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java index a88b3e3..07576d2 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java @@ -25,9 +25,9 @@ import com.cpop.jambox.business.vo.EasyLearnPageVo; import com.cpop.jambox.framework.constant.JamboxRedisConstant; import com.cpop.pay.framewok.handler.wxPay.WxPayHandler; import com.cpop.pay.framewok.task.WxPayAsyncTask; -import com.cpop.system.business.service.ProfitSharingService; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; +import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import com.mybatisflex.core.FlexGlobalConfig; @@ -51,7 +51,6 @@ import java.util.concurrent.locks.Lock; import static com.cpop.jambox.business.entity.table.BrandExtendTableDef.BRAND_EXTEND; import static com.cpop.jambox.business.entity.table.EasyLearnOrderTableDef.EASY_LEARN_ORDER; import static com.cpop.jambox.business.entity.table.StoreExtendTableDef.STORE_EXTEND; -import static com.cpop.system.business.entity.table.ProfitSharingTableDef.PROFIT_SHARING; /** * 果酱-放心学订单表 服务层实现。 @@ -357,8 +356,8 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl { */ void wxPayNotifyOrder(String xmlData); - /** - * @descriptions 分账结果通知 - * @author DB - * @date 2023/11/03 9:50 - * @param xmlData 加密数据 - * @return: void - */ - void parseProfitSharingNotifyResult(String xmlData); - /** * @descriptions 取消订单 * @author DB diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java index 579f56c..7b4a68b 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java @@ -538,31 +538,6 @@ public class OrderServiceImpl extends ServiceImpl implements } } - /** - * @descriptions 分账结果通知 - * @author DB - * @date 2023/11/03 9:50 - * @param xmlData 加密数据 - * @return: void - */ - @Override - public void parseProfitSharingNotifyResult(String xmlData) { - WxPayService wxPayService = wxPayHandler.getWxPayService(); - try { - WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData); - //更新分账订单 - SpringUtils.getBean(ProfitSharingService.class).updateChain().set(PROFIT_SHARING.OUT_PROFIT_SHARING_ID, notifyResult.getTransactionId()) - .set(PROFIT_SHARING.AMOUNT, notifyResult.getTotalFee()) - .set(PROFIT_SHARING.PROFIT_SHARING_STATUS, 1) - //当前分账账户 - .set(PROFIT_SHARING.PAY_ACCOUNT, wxPayService.getConfig().getSubMchId()) - .where(PROFIT_SHARING.ID.eq(notifyResult.getOutTradeNo())) - .update(); - } catch (WxPayException e) { - throw new ServiceException(e.getMessage()); - } - } - /** * @descriptions 取消订单 * @author DB @@ -634,7 +609,6 @@ public class OrderServiceImpl extends ServiceImpl implements WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest(); //查询是否是服务商系品牌 String brandId = loginUserInfo.getString("brandId"); - Brand brand = SpringUtils.getBean(BrandService.class).getById(brandId); //需要分账 if (order.getTotalAmount().scaleByPowerOfTen(2).intValue() >= 10) { //需要分账 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DataImportBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DataImportBo.java index 8aa7b20..6a88241 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DataImportBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DataImportBo.java @@ -44,7 +44,6 @@ public class DataImportBo { * 导入文件地址 */ @NotBlank(message = "不能为空") - @StringArrayConvert @ApiModelProperty(value = "导入文件地址") private String fileUrl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/ReimburseApplicationBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/ReimburseApplicationBo.java index 4f45b57..c26a145 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/ReimburseApplicationBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/ReimburseApplicationBo.java @@ -1,7 +1,6 @@ package com.cpop.oam.business.bo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.cpop.core.annontation.StringArrayConvert; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -55,7 +54,6 @@ public class ReimburseApplicationBo implements Serializable { /** * 附件 */ - @StringArrayConvert @ApiModelProperty(value = "附件") private String attachmentUrl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskDemandBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskDemandBo.java index 15d5f34..fafb1da 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskDemandBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskDemandBo.java @@ -50,7 +50,6 @@ public class TaskDemandBo { /** * 附件地址 */ - @StringArrayConvert @ApiModelProperty("附件地址") private String attachmentUrl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskItemBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskItemBo.java index e4a6b46..8d83b36 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskItemBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskItemBo.java @@ -38,7 +38,6 @@ public class TaskItemBo { /** * 测试转部署文件路径 */ - @StringArrayConvert @ApiModelProperty(value = "测试转部署文件路径") private String testToFinishUrl; } diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskIterationBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskIterationBo.java index 8258105..311cbc3 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskIterationBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskIterationBo.java @@ -39,7 +39,6 @@ public class TaskIterationBo { /** * 附件地址 */ - @StringArrayConvert @ApiModelProperty("附件地址") private String attachmentUrl; } diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderBo.java index 8cab30e..6a9958f 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderBo.java @@ -65,7 +65,6 @@ public class TaskWorkOrderBo { /** * 附件地址 */ - @StringArrayConvert @ApiModelProperty("附件地址") private String attachmentUrl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderRecordBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderRecordBo.java index 6e4c2dc..1967d22 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderRecordBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/TaskWorkOrderRecordBo.java @@ -36,7 +36,6 @@ public class TaskWorkOrderRecordBo { /** * 附件地址 */ - @StringArrayConvert @ApiModelProperty(value = "附件地址", required = true) private String attachmentUrl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java index 2651a66..0d95a35 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java @@ -86,7 +86,7 @@ public class DataImportServiceImpl extends ServiceImpl getReimburseAuditPage(FinanceReimburseAuditPageBo bo) { PageDomain pageDomain = SqlUtils.getInstance().getPageDomain(); - QueryWrapper queryWrapper = QueryWrapper.create(); - if (bo.getStatus()!=null){ - if (bo.getStatus() == 0) { - //状态 - queryWrapper.and(FINANCE_REIMBURSE.STATUS.in(0, -1)); - } else { - //状态 - queryWrapper.and(FINANCE_REIMBURSE.STATUS.eq(bo.getStatus())); - } - } return this.mapper.paginateAs(pageDomain.getPageNum(), pageDomain.getPageSize(), - queryWrapper.select(FINANCE_REIMBURSE.ALL_COLUMNS) + QueryWrapper.create().select(FINANCE_REIMBURSE.ALL_COLUMNS) .select(STAFF.NAME.as(FinanceReimbursePageVo::getStaffName)) .select(FINANCE_REIMBURSE_TYPE.TYPE_NAME.as(FinanceReimbursePageVo::getTypeName)) .from(FINANCE_REIMBURSE) @@ -114,6 +104,7 @@ public class FinanceReimburseServiceImpl extends ServiceImpl item.field(TaskDemandPageVo::getRecordStaffName) - .queryWrapper(recordStaffName -> queryWrapper.create() - .select(STAFF.NAME.as(TaskDemandPageVo::getRecordStaffName)) - .from(STAFF) - .where(STAFF.ID.eq(recordStaffName.getRecordStaffId()))), - // 更新人员 - item -> item.field(TaskDemandPageVo::getUpdateStaffName) - .queryWrapper(updateStaffName -> queryWrapper.create() - .select(STAFF.NAME.as(TaskDemandPageVo::getUpdateStaffName)) - .from(STAFF) - .leftJoin(SYS_USER) - .on(SYS_USER.ID.eq(STAFF.USER_ID)) - .where(SYS_USER.ID.eq(updateStaffName.getUpdateUserId())) - .and(SYS_USER.USER_TYPE.eq(UserType.OAM_USER.toString())) - .limit(1)), - // 任务接收员工 - item -> item.field(TaskDemandPageVo::getResponsibleStaffName).queryWrapper(responsibleStaffName -> { - if (StringUtils.isNotBlank(responsibleStaffName.getResponsibleStaffId())) { - return queryWrapper.create() - .select(STAFF.NAME.as(TaskDemandPageVo::getResponsibleStaffId)) - .from(STAFF) - .where(STAFF.ID.eq(responsibleStaffName.getResponsibleStaffId())); - } else { - return null; - } - })); + queryWrapper + .select(TASK_DEMAND.ID, + TASK_DEMAND.BRAND_ID, + TASK_DEMAND.STORE_ID, + TASK_DEMAND.CREATE_TIME, + TASK_DEMAND.UPDATE_USER_ID, + TASK_DEMAND.UPDATE_TIME) + // 品牌 + .select(BRAND.BRAND_NAME) + // 校区 + .select(STORE.STORE_NAME) + // 任务 + .select(TASK.TASK_CONTENT, + TASK.RECORD_STAFF_ID, + TASK.IS_URGENT, + TASK.ATTACHMENT_URL, + TASK.EXPECTED_COMPLETION_DATE, + TASK.TASK_RATING, + TASK.RESPONSIBLE_STAFF_ID, + TASK.TASK_RECEIPT_TIME, + TASK.REMARK, + TASK.COMPLETION_DATE, + TASK.TEST_TO_FINISH_URL) + .from(TASK_DEMAND) + // 任务需求表 + .leftJoin(TASK) + .on(TASK.ID.eq(TASK_DEMAND.TASK_ID)) + // 校区表 + .leftJoin(STORE) + .on(STORE.ID.eq(TASK_DEMAND.STORE_ID)) + // 品牌表 + .leftJoin(BRAND) + .on(BRAND.ID.eq(TASK_DEMAND.BRAND_ID)) + .where(TASK.TASK_TYPE.eq(1)) + .and(TASK.TASK_CONTENT.like(bo.getTaskContent())) + .and(STORE.STORE_NAME.like(bo.getBrandOrStore()).or(BRAND.BRAND_NAME.like(bo.getBrandOrStore()))), + TaskDemandPageVo.class, + // 记录员工名 + item -> item.field(TaskDemandPageVo::getRecordStaffName) + .queryWrapper(recordStaffName -> queryWrapper.create() + .select(STAFF.NAME.as(TaskDemandPageVo::getRecordStaffName)) + .from(STAFF) + .where(STAFF.ID.eq(recordStaffName.getRecordStaffId()))), + // 更新人员 + item -> item.field(TaskDemandPageVo::getUpdateStaffName) + .queryWrapper(updateStaffName -> queryWrapper.create() + .select(STAFF.NAME.as(TaskDemandPageVo::getUpdateStaffName)) + .from(STAFF) + .leftJoin(SYS_USER) + .on(SYS_USER.ID.eq(STAFF.USER_ID)) + .where(SYS_USER.ID.eq(updateStaffName.getUpdateUserId())) + .and(SYS_USER.USER_TYPE.eq(UserType.OAM_USER.toString())) + .limit(1)), + // 任务接收员工 + item -> item.field(TaskDemandPageVo::getResponsibleStaffName).queryWrapper(responsibleStaffName -> { + if (StringUtils.isNotBlank(responsibleStaffName.getResponsibleStaffId())) { + return queryWrapper.create() + .select(STAFF.NAME.as(TaskDemandPageVo::getResponsibleStaffId)) + .from(STAFF) + .where(STAFF.ID.eq(responsibleStaffName.getResponsibleStaffId())); + } else { + return null; + } + })); } /** diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimburseAuditPageVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimburseAuditPageVo.java index 287505e..24691a4 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimburseAuditPageVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimburseAuditPageVo.java @@ -80,7 +80,6 @@ public class FinanceReimburseAuditPageVo implements Serializable { /** * 附件 */ - @StringArrayConvert @ApiModelProperty("附件") private String attachmentUrl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimbursePageVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimbursePageVo.java index 48c8352..2809cb0 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimbursePageVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/FinanceReimbursePageVo.java @@ -1,6 +1,5 @@ package com.cpop.oam.business.vo; -import com.cpop.core.annontation.StringArrayConvert; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -80,7 +79,6 @@ public class FinanceReimbursePageVo implements Serializable { /** * 附件 */ - @StringArrayConvert @ApiModelProperty("附件") private String attachmentUrl; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskArchivingPagVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskArchivingPagVo.java index a4317b7..c358593 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskArchivingPagVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskArchivingPagVo.java @@ -1,6 +1,5 @@ package com.cpop.oam.business.vo; -import com.cpop.core.annontation.StringArrayConvert; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -107,7 +106,6 @@ public class TaskArchivingPagVo { /** * 操作流程 */ - @StringArrayConvert @ApiModelProperty("操作流程") private String testToFinishUrl; } diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskDemandPageVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskDemandPageVo.java index 0f67d35..69e46ac 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskDemandPageVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskDemandPageVo.java @@ -8,7 +8,6 @@ import lombok.experimental.Accessors; import java.time.LocalDateTime; import java.time.LocalDate; -import com.cpop.core.annontation.StringArrayConvert; /** * 需求分页对象 @@ -60,7 +59,6 @@ public class TaskDemandPageVo { /** * 附件地址 */ - @StringArrayConvert @ApiModelProperty("附件地址") private String attachmentUrl; @@ -138,7 +136,11 @@ public class TaskDemandPageVo { /**测试转部署文件 */ @ApiModelProperty("测试转部署文件") - @StringArrayConvert private String testToFinishUrl; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String remark; } diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskToBeClaimedPageVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskToBeClaimedPageVo.java index f9ac31e..b7d5d9c 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskToBeClaimedPageVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskToBeClaimedPageVo.java @@ -1,6 +1,5 @@ package com.cpop.oam.business.vo; -import com.cpop.core.annontation.StringArrayConvert; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,7 +32,6 @@ public class TaskToBeClaimedPageVo { /**附件地址 */ @ApiModelProperty(value = "附件地址") - @StringArrayConvert private String attachmentUrl; /**任务评级(0:A;1:B;2:C;3:D;4:E) */ diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskWorkOrderRecordListVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskWorkOrderRecordListVo.java index e93cc4e..678a5e8 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskWorkOrderRecordListVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/TaskWorkOrderRecordListVo.java @@ -8,7 +8,6 @@ import lombok.experimental.Accessors; import java.time.LocalDateTime; -import com.cpop.core.annontation.StringArrayConvert; /** * 任务-工单记录-记录 @@ -60,7 +59,6 @@ public class TaskWorkOrderRecordListVo { /** * 附件地址 */ - @StringArrayConvert @ApiModelProperty("附件地址") private String attachmentUrl; diff --git a/Cpop-Pay/src/main/java/com/cpop/pay/framewok/config/wxPay/WxPayProperties.java b/Cpop-Pay/src/main/java/com/cpop/pay/framewok/config/wxPay/WxPayProperties.java index 1c4b100..512d808 100644 --- a/Cpop-Pay/src/main/java/com/cpop/pay/framewok/config/wxPay/WxPayProperties.java +++ b/Cpop-Pay/src/main/java/com/cpop/pay/framewok/config/wxPay/WxPayProperties.java @@ -71,8 +71,4 @@ public class WxPayProperties { */ private String sharingAccountName; - /** - * 分账通知 - */ - private String notifySharing; } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/bo/BrandBo.java b/Cpop-System/src/main/java/com/cpop/system/business/bo/BrandBo.java index 4bbe74d..06a494c 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/bo/BrandBo.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/bo/BrandBo.java @@ -1,7 +1,5 @@ package com.cpop.system.business.bo; -import com.cpop.core.annontation.StringArrayConvert; -import com.mybatisflex.annotation.Id; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/bo/MenuBo.java b/Cpop-System/src/main/java/com/cpop/system/business/bo/MenuBo.java index 16af257..c950766 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/bo/MenuBo.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/bo/MenuBo.java @@ -106,4 +106,10 @@ public class MenuBo implements Serializable { @ApiModelProperty("隐藏菜单") private Boolean hideMenu; + /** + * 是否忽略KeepAlive缓存 + */ + @ApiModelProperty("是否忽略KeepAlive缓存") + private Boolean ignoreKeepAlive; + } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreServiceImpl.java b/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreServiceImpl.java index e40abfb..af4abcd 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreServiceImpl.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreServiceImpl.java @@ -88,7 +88,7 @@ public class StoreServiceImpl extends ServiceImpl implements BrandService brandService = SpringUtils.getBean(BrandService.class); if (brandExtend.isEmpty()) { brand = new Brand(); - brand.setBrandName(brandInfo.getBrandName()).setSourceType(SourceType.JAMBOX.getName()); + brand.setBrandName(brandInfo.getBrandName()).setSourceType(SourceType.JAMBOX.toString()); brandService.save(brand); //保存拓展 RowKey brandKey = RowKey.SNOW_FLAKE_ID; @@ -105,7 +105,7 @@ public class StoreServiceImpl extends ServiceImpl implements brand = brandService.getById(brandExtend.getString("brandId")); } Store store = BeanUtils.mapToClass(bo.getStoreInfo(), Store.class); - store.setBrandId(brand.getId()).setSourceType(SourceType.JAMBOX.getName()); + store.setBrandId(brand.getId()).setSourceType(SourceType.JAMBOX.toString()); this.save(store); //拓展 SyncBrandAndStoreBo.StoreInfo storeInfo = bo.getStoreInfo(); diff --git a/Cpop-System/src/main/java/com/cpop/system/business/vo/BrandPageVo.java b/Cpop-System/src/main/java/com/cpop/system/business/vo/BrandPageVo.java index e62db27..0396926 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/vo/BrandPageVo.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/vo/BrandPageVo.java @@ -1,6 +1,5 @@ package com.cpop.system.business.vo; -import com.cpop.core.annontation.StringArrayConvert; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty;