|
@@ -148,7 +148,8 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
private void setReceiptPermissions(ReceiptUserVo receiptUser) {
|
|
|
// 用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,
|
|
|
- // 9非订单款查看(全部),10订单款查看(全部),11返佣款查看(全部),12供应商退款查看(全部),13订单款查看(协销自己机构),14返佣款查看(协销自己机构),15供应商退款查看(协销自己机构)
|
|
|
+ // 9非订单款查看(全部),10订单款查看(全部),11返佣款查看(全部),12供应商退款查看(全部),
|
|
|
+ // 13订单款查看(协销自己机构),14返佣款查看(协销自己机构),15供应商退款查看(协销自己机构)
|
|
|
// 16订单款查看(协销小组机构),17返佣款查看(协销小组机构),18供应商退款查看(协销小组机构),19款项详情查看
|
|
|
List<Integer> permissions = receiptMapper.getPermissionsByUserId(receiptUser.getId());
|
|
|
receiptUser.setPermissions(permissions);
|
|
@@ -576,7 +577,7 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
// 返佣款
|
|
|
else if (3 == receiptType) {
|
|
|
// 检查收款用户权限:11返佣款查看(全部),14返佣款查看(协销自己机构),17返佣款查看(协销小组机构)
|
|
|
- receiptUser = checkPermissions(Arrays.asList(11, 14), headers);
|
|
|
+ receiptUser = checkPermissions(Arrays.asList(11, 14, 17), headers);
|
|
|
if (null == receiptUser) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -634,6 +635,9 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
return ResponseJson.success(pageInfo);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 设置协销小组下的机构userIds
|
|
|
+ */
|
|
|
private List<Integer> getTeamClubUserIds(ReceiptUserVo receiptUser) {
|
|
|
List<Integer> clubUserIds = null;
|
|
|
if (1 == receiptUser.getUserType()) {
|
|
@@ -674,11 +678,8 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
public ResponseJson<ReceiptVo> getReceiptDetail(Integer id, HttpHeaders headers) {
|
|
|
// 检查收款用户权限:9非订单款查看(全部),10订单款查看(全部),13订单款查看(协销自己机构),16订单款查看(协销小组机构)
|
|
|
ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(9, 10, 13, 16), headers);
|
|
|
-// if (null == receiptUser) {
|
|
|
-// return ResponseJson.error("无权限操作!", null);
|
|
|
-// }
|
|
|
- //改为独立权限,有详情查看权限才能看 19,款项详情查看
|
|
|
- ReceiptUserVo receiptCheck = checkPermissions(Arrays.asList(19), headers);
|
|
|
+ // 收款详情改为独立权限,有详情查看权限才能看 19,款项详情查看
|
|
|
+ ReceiptUserVo receiptCheck = checkPermissions(Collections.singletonList(19), headers);
|
|
|
if (null == receiptCheck) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -710,7 +711,6 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
if (receipt.getNewReceiptType() == 2) {
|
|
|
orderList = receiptMapper.getReceiptOrderlist(receipt.getId());
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
log.info("【线下收款】-----已确认--------");
|
|
|
}
|
|
@@ -779,9 +779,11 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<ReceiptVo> getReceiptRefundDetail(Integer id, HttpHeaders headers) {
|
|
|
- // 检查收款用户权限: 12供应商退款查看(全部),15供应商退款查看(协销自己机构)
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(12, 15), headers);
|
|
|
- if (null == receiptUser) {
|
|
|
+// // 检查收款用户权限: 12供应商退款查看(全部),15供应商退款查看(协销自己机构),18供应商退款查看(协销小组机构)
|
|
|
+// ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(12, 15, 18), headers);
|
|
|
+ // 收款详情改为独立权限,有详情查看权限才能看 19,款项详情查看
|
|
|
+ ReceiptUserVo receiptCheck = checkPermissions(Collections.singletonList(19), headers);
|
|
|
+ if (null == receiptCheck) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
|
ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
|
|
@@ -796,9 +798,14 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<ReceiptVo> getReceiptRebateDetail(Integer id, HttpHeaders headers) {
|
|
|
- // 检查收款用户权限:11返佣款查看(全部),14返佣款查看(协销自己机构)
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(11, 14), headers);
|
|
|
- if (null == receiptUser) {
|
|
|
+ // 检查收款用户权限:11返佣款查看(全部),14返佣款查看(协销自己机构),17返佣款查看(协销小组机构)
|
|
|
+// ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(11, 14, 17), headers);
|
|
|
+// if (null == receiptUser) {
|
|
|
+// return ResponseJson.error("无权限操作!", null);
|
|
|
+// }
|
|
|
+ // 收款详情改为独立权限,有详情查看权限才能看 19,款项详情查看
|
|
|
+ ReceiptUserVo receiptCheck = checkPermissions(Collections.singletonList(19), headers);
|
|
|
+ if (null == receiptCheck) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
|
ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
|
|
@@ -964,8 +971,8 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<PageInfo<ShopOrderVo>> getRefundShopOrderList(Integer id, Integer confirmedType, String shopName, String keyword, int pageNum, int pageSize, HttpHeaders headers) {
|
|
|
- // 检查收款用户权限: 12供应商退款查看(全部),15供应商退款查看(协销自己机构)
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(12, 15), headers);
|
|
|
+ // 检查收款用户权限: 12供应商退款查看(全部),15供应商退款查看(协销自己机构),18供应商退款查看(协销小组机构)
|
|
|
+ ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(12, 15, 18), headers);
|
|
|
if (null == receiptUser) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -1008,8 +1015,8 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<OrderVo> getRefundShopOrderInfo(Integer orderId, HttpHeaders headers) {
|
|
|
- // 检查收款用户权限: 12供应商退款查看(全部),15供应商退款查看(协销自己机构)
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(12, 15), headers);
|
|
|
+ // 检查收款用户权限: 12供应商退款查看(全部),15供应商退款查看(协销自己机构),18供应商退款查看(协销小组机构)
|
|
|
+ ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(12, 15, 18), headers);
|
|
|
if (null == receiptUser) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -1070,8 +1077,8 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<PageInfo<ShopOrderVo>> getRebateShopOrderList(Integer id, String shopName, int pageNum, int pageSize, HttpHeaders headers) {
|
|
|
- // 检查收款用户权限:11返佣款查看(全部),14返佣款查看(协销自己机构)
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(11, 14), headers);
|
|
|
+ // 检查收款用户权限:11返佣款查看(全部),14返佣款查看(协销自己机构),17返佣款查看(协销小组机构)
|
|
|
+ ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(11, 14, 17), headers);
|
|
|
if (null == receiptUser) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -2048,8 +2055,9 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
/**
|
|
|
* 检查收款权限
|
|
|
* 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,
|
|
|
- * 9非订单款查看(全部),10订单款查看(全部),11返佣款查看(全部),12供应商退款查看(全部),13订单款查看(协销自己机构),14返佣款查看(协销自己机构),15供应商退款查看(协销自己机构)
|
|
|
- *
|
|
|
+ * 9非订单款查看(全部),10订单款查看(全部),11返佣款查看(全部),12供应商退款查看(全部),
|
|
|
+ * 13订单款查看(协销自己机构),14返佣款查看(协销自己机构),15供应商退款查看(协销自己机构)
|
|
|
+ * 16订单款查看(协销小组机构),17返佣款查看(协销小组机构),18供应商退款查看(协销小组机构),19款项详情查看
|
|
|
* @param permission 0:登录用户不需要权限,其他具体权限
|
|
|
* @param headers HttpHeaders
|
|
|
* @return null:无权限/权限用户ReceiptUserVo
|