|
@@ -1702,8 +1702,12 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
|
|
|
if (signType > 0) {
|
|
|
//新套餐,需要给校区服务和批改服务两个,结束时间保持一致
|
|
|
//查询这个馆下有没有有效的服务
|
|
|
- endDate = this.getEndDate(vipId, libId);
|
|
|
- this.insertLibCorrectService(vipId, libId, endDate);
|
|
|
+ endDate = this.getEndDate(vipId, libId);
|
|
|
+ //2021-02-07 深圳吴老师学校商户只给平台批改服务
|
|
|
+ Merchant merchant = merchantService.getMerchantByLibId(libId);
|
|
|
+ if(Objects.isNull(merchant) || merchant.getPosType()!=3){
|
|
|
+ this.insertLibCorrectService(vipId, libId, endDate);
|
|
|
+ }
|
|
|
this.insertLibService(vipId, libId, endDate);
|
|
|
} else {
|
|
|
//老套餐,只需要给指定的校区服务
|