rk
17 小时以前 988532c1e3e18da8120a034e2a843d50eba14f42
小程序   接口开发
已修改2个文件
10 ■■■■■ 文件已修改
server/dmmall_service/src/main/java/com/doumee/service/business/AftersaleService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/AftersaleService.java
@@ -116,5 +116,5 @@
    void autoDone();
    void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest, Integer userId);
    void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest);
}
server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java
@@ -1009,7 +1009,8 @@
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest, Integer userId){
    public void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest){
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Objects.isNull(afterSaleApplyRequest)
            || Objects.isNull(afterSaleApplyRequest.getOrderId())
                || Objects.isNull(afterSaleApplyRequest.getReturnUseIntegralStatus())
@@ -1032,6 +1033,7 @@
        }
        Aftersale aftersale = new Aftersale();
        aftersale.setCreateDate(new Date());
        aftersale.setCreator(loginUserInfo.getId());
        aftersale.setIsdeleted(Constants.ZERO);
        aftersale.setOrderId(goodsorder.getId());
        aftersale.setType(Constants.ZERO);
@@ -1142,10 +1144,10 @@
            String refundCode = WxMiniUtilService.wxRefund(goodsorder.getCode().toString(), goodsorder.getPrice(), afterSaleApplyRequest.getMoney());
            Fund fund = new Fund();
            fund.setOrderCode(refundCode);
            fund.setCreator(userId);
            fund.setCreator(loginUserInfo.getId());
            fund.setCreateDate(new Date());
            fund.setIsdeleted(Constants.ZERO);
            fund.setRemark(userId.toString());
            fund.setRemark(loginUserInfo.getId().toString());
            fund.setMemberId(goodsorder.getCreator());
            fund.setTitle("订单退款");
            fund.setContent(afterSaleApplyRequest.getRemark());