|
@@ -512,7 +512,7 @@ public class TOrderController {
|
|
|
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(param.getClientId())){
|
|
|
- param.setAdminId(null);
|
|
|
+// param.setAdminId(null);
|
|
|
//判断是否是这个商家的
|
|
|
TEquipment tEquipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(param.getClientId()));
|
|
|
if(tEquipment.getAdminId().toString().equals(admin.getId().toString())){
|
|
@@ -556,7 +556,7 @@ public class TOrderController {
|
|
|
param.setAdminId(null);
|
|
|
//判断是否是这个子账号的
|
|
|
TEquipment tEquipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(param.getClientId()));
|
|
|
-
|
|
|
+ // TODO 设置用户id为商家id
|
|
|
TAdminEquipment adminEquipment = R.getDataIfSuccess(szwlFeign.getClientIdList(String.valueOf(admin.getId())));
|
|
|
if(adminEquipment.getType().equals("0")){
|
|
|
TAdmin admin1 = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(admin.getParentId())));
|