1、优化企业套餐逻辑

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/EnterpriseUserMemberConsumer.java

@@ -42,7 +42,7 @@ public class EnterpriseUserMemberConsumer implements RocketMQListener<Long> {
     @Override
     @DSTransactional
     public void onMessage(Long orderId) {
-        StopWatch stopWatch = new StopWatch("开通企业会员["+orderId+"]");
+        StopWatch stopWatch = new StopWatch("开通企业会员[" + orderId + "]");
         stopWatch.start();
         TradeOrderDO order = tradeOrderService.getOrder(orderId);
         EnterprisePackageDO packageDO = enterprisePackageService.getEnterprisePackage(order.getSpuId());
@@ -57,10 +57,11 @@ public class EnterpriseUserMemberConsumer implements RocketMQListener<Long> {
                 .enterpriseId(order.getEnterpriseId())
                 .userId(order.getUserId())
                 .publishJobCount(entitlement.getPublishJobCount() + packageDO.getPublishJobCount())
-                .searchCount(entitlement.getSearchCount() +packageDO.getSearchCount())
-                .lookCvCount(entitlement.getLookCvCount() +packageDO.getLookCvCount())
-                .personMap(packageDO.getPersonMap())
-                .hireJob(packageDO.getHireJob())
+                .searchCount(entitlement.getSearchCount() + packageDO.getSearchCount())
+                .lookCvCount(entitlement.getLookCvCount() + packageDO.getLookCvCount())
+                // 如果套餐的权益为true则用套餐，否则就用原本的
+                .personMap(packageDO.getPersonMap() || entitlement.getPersonMap())
+                .hireJob(packageDO.getHireJob() || entitlement.getHireJob())
                 .build()
         );
         stopWatch.prettyPrint();