|
@@ -524,7 +524,7 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
/**
|
|
|
* 收款详情(订单/非订单)
|
|
|
*
|
|
|
- * @param id 款项Id
|
|
|
+ * @param id 款项Id
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson<ReceiptVo> getReceiptDetail(Integer id, HttpHeaders headers) {
|
|
@@ -742,6 +742,7 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
|
|
|
/**
|
|
|
* 供应商退款-子订单列表
|
|
|
+ *
|
|
|
* @param id 收款ID
|
|
|
* @param confirmedType 0待确认,2已确认子订单
|
|
|
* @param shopName 供应商名称
|
|
@@ -884,10 +885,17 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
|
|
|
/**
|
|
|
* 关联收款信息
|
|
|
+ *
|
|
|
+ * @param receiptAssociateDto {
|
|
|
+ * id: 收款Id
|
|
|
+ * orderIds: 关联订单IDS
|
|
|
+ * confirmType: 确认订单类型:1小额抹平确认,2大额抹平确认,3大额退款余额,4确认关联
|
|
|
+ * noOrderReason: 非订单款说明
|
|
|
+ * }
|
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
- public ResponseJson<ReceiptPo> receiptAssociate(ReceiptAssociateDto receiptAssociateDto, HttpHeaders headers) {
|
|
|
+ public ResponseJson<Void> receiptAssociate(ReceiptAssociateDto receiptAssociateDto, HttpHeaders headers) {
|
|
|
// 检查收款用户权限
|
|
|
ReceiptUserVo receiptUser = checkPermissions(1, headers);
|
|
|
if (null == receiptUser) {
|
|
@@ -1062,17 +1070,39 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
receiptPo.setConfirmUserPermissionId(receiptUser.getId());
|
|
|
receiptPo.setConfirmDate(time);
|
|
|
receiptMapper.updateReceipt(receiptPo);
|
|
|
- return ResponseJson.success(receiptPo);
|
|
|
+ // 关联成功推送模板消息给审核人员
|
|
|
+ List<String> openidList = receiptMapper.getOpenidListByUserType(3);
|
|
|
+ openidList.removeIf(Objects::isNull);
|
|
|
+ double associateAmount = receiptMapper.countAssociateAmountById(receipt.getId());
|
|
|
+ String associateTitle = "收款和订单已确认关联,请及时审核!";
|
|
|
+ String associateDate = receipt.getReceiptDate();
|
|
|
+ String associateType = receiptMapper.getReceiptTypeStrById(receipt.getPayType());
|
|
|
+
|
|
|
+
|
|
|
+ //todo 跳转链接 crm旧链接:/api/user/receivables/toReceivablesPage.rpc?pageName=listToDesc&id=receipt.getId()
|
|
|
+
|
|
|
+
|
|
|
+ String redirectUrl = "";
|
|
|
+ for (String openid : openidList) {
|
|
|
+ // sendTemplateMsg(openid, 标题, 金额, 收款类型, 收款日期, 跳转链接)
|
|
|
+ weChatService.sendTemplateMsg(openid, associateTitle, associateAmount, associateType, associateDate, redirectUrl);
|
|
|
+ }
|
|
|
+ return ResponseJson.success("关联收款信息成功!", null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 确认收款-关联供应商退款
|
|
|
+ *
|
|
|
+ * @param receiptAssociateDto {
|
|
|
+ * id: 收款Id
|
|
|
+ * shopOrderId: 关联供应商退款子订单ID
|
|
|
+ * }
|
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
public ResponseJson<ReceiptPo> receiptAssociateRefund(ReceiptAssociateDto receiptAssociateDto, HttpHeaders headers) {
|
|
|
// 检查收款用户权限
|
|
|
- ReceiptUserVo receiptUser = checkPermissions(1, headers);
|
|
|
+ ReceiptUserVo receiptUser = checkPermissions(5, headers);
|
|
|
if (null == receiptUser) {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
@@ -1088,6 +1118,29 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
|
|
|
|
|
|
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 确认收款-关联返佣款
|
|
|
+ *
|
|
|
+ * @param receiptAssociateDto {
|
|
|
+ * id: 收款Id
|
|
|
+ * shopOrderIds: 关联返佣子订单IDs
|
|
|
+ * rebateRemarks:关联返佣备注
|
|
|
+ * }
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public ResponseJson<ReceiptPo> receiptAssociateRebate(ReceiptAssociateDto receiptAssociateDto, HttpHeaders headers) {
|
|
|
+ // 检查收款用户权限
|
|
|
+ ReceiptUserVo receiptUser = checkPermissions(4, headers);
|
|
|
+ if (null == receiptUser) {
|
|
|
+ return ResponseJson.error("无权限操作!", null);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -1137,7 +1190,7 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
BigDecimal brokerage = BigDecimal.ZERO;
|
|
|
List<OrderProductVo> orderProductList = orderCommonMapper.getShopOrderProduct(shopOrder.getShopOrderId());
|
|
|
orderProductList.removeIf(Objects::isNull);
|
|
|
- for (OrderProductVo orderProduct : orderProductList){
|
|
|
+ for (OrderProductVo orderProduct : orderProductList) {
|
|
|
// 已退货数量
|
|
|
Integer returnedNum = orderCommonMapper.countReturnedNum(orderProduct.getShopOrderId(), orderProduct.getProductId());
|
|
|
returnedNum = null != returnedNum ? returnedNum : 0;
|