|
@@ -1467,7 +1467,6 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
|
|
|
|
|
|
//如果修改了套餐的模式,就重新处理数据 加油包
|
|
|
if(!oldmerchant.getSignType().equals(merchant.getSignType())) {
|
|
|
- oldmerchant.setSignType(merchant.getSignType());
|
|
|
List<MerchantSign> merchantSigns=merchantSignService.findMerchantSignByMerchantId(merchant.getId(),0);
|
|
|
Integer signNum=0;
|
|
|
for (MerchantSign merchantSign : merchantSigns) {
|
|
@@ -1476,15 +1475,19 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
|
|
|
switch (merchant.getSignType()) {
|
|
|
case 1:
|
|
|
oldmerchant.setLibService(30+signNum);
|
|
|
+ oldmerchant.setPortNum(200);
|
|
|
break;
|
|
|
case 2:
|
|
|
oldmerchant.setLibService(50+signNum);
|
|
|
+ oldmerchant.setPortNum(200);
|
|
|
break;
|
|
|
case 3:
|
|
|
oldmerchant.setLibService(100+signNum);
|
|
|
+ oldmerchant.setPortNum(400);
|
|
|
break;
|
|
|
default:
|
|
|
oldmerchant.setLibService(0);
|
|
|
+ oldmerchant.setPortNum(0);
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -1498,6 +1501,16 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
|
|
|
consume.setRemarks("充值【套餐模式更改】");
|
|
|
consume.setCreateTime(new Date());
|
|
|
libJoinConsumeService.save(consume);
|
|
|
+
|
|
|
+
|
|
|
+ //旧套餐大于新套餐的话,就服务降级
|
|
|
+ if(oldmerchant.getSignType()>merchant.getSignType()
|
|
|
+ && StringUtils.isNotEmpty(oldmerchant.getLibId())) {
|
|
|
+ //调用灿的降级服务接口
|
|
|
+
|
|
|
+ }
|
|
|
+ //更新套餐
|
|
|
+ oldmerchant.setSignType(merchant.getSignType());
|
|
|
}
|
|
|
|
|
|
this.save(oldmerchant);
|
|
@@ -1566,15 +1579,19 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
|
|
|
switch (merchant.getSignType()) {
|
|
|
case 1:
|
|
|
merchant.setLibService(30);
|
|
|
+ merchant.setPortNum(200);
|
|
|
break;
|
|
|
case 2:
|
|
|
merchant.setLibService(50);
|
|
|
+ merchant.setPortNum(200);
|
|
|
break;
|
|
|
case 3:
|
|
|
merchant.setLibService(100);
|
|
|
+ merchant.setPortNum(400);
|
|
|
break;
|
|
|
default:
|
|
|
merchant.setLibService(0);
|
|
|
+ merchant.setPortNum(0);
|
|
|
break;
|
|
|
}
|
|
|
|