|
@@ -586,8 +586,8 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<ReceiptVo> getReceiptRefundDetail(Integer id, HttpHeaders headers) {
|
|
|
- // 检查收款用户权限
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(2, headers);
|
|
|
+ // 检查收款用户权限: 1收款列表访问,2收款详情访问,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
|
|
|
+ ReceiptUserVo receiptUser = checkPermissions(6, headers);
|
|
|
if (null == receiptUser) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -603,8 +603,8 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<ReceiptVo> getReceiptRebateDetail(Integer id, HttpHeaders headers) {
|
|
|
- // 检查收款用户权限
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(2, headers);
|
|
|
+ // 检查收款用户权限: 1收款列表访问,2收款详情访问,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
|
|
|
+ ReceiptUserVo receiptUser = checkPermissions(5, headers);
|
|
|
if (null == receiptUser) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -1143,7 +1143,7 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
Double refundAmount = receiptMapper.getRefundShopAmount(receiptOperateDto.getShopOrderId());
|
|
|
// 确认本次收款金额大于已付金额与已退金额的差值,不能关联
|
|
|
if (MathUtil.compare(shopOrder.getPayedShopAmount(), MathUtil.add(refundAmount, receipt.getReceiptAmount())) < 0) {
|
|
|
- return ResponseJson.error("确认本次收款金额大于已付金额与已退金额的差值,不能关联!", null);
|
|
|
+ return ResponseJson.error("本次确认收款金额大于已付金额与已退金额的差值,不能关联!", null);
|
|
|
}
|
|
|
//删除之前与这个收款的关联
|
|
|
receiptMapper.deleteReceiptRelation(receipt.getId());
|