Merge remote-tracking branch 'origin/master-0729-功能优化' into master-base

rx

2024-08-05 163afd2b1eff0237bbded84f85210fbf818c6195

Merge remote-tracking branch 'origin/master-0729-功能优化' into master-base

 phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java

@@ -44,10 +44,7 @@
import com.hx.util.thread.ExecutorServiceTool;
import com.hz.crm.dto.oldBrinNew.OldBrinNewDto;
import com.hz.crm.feign.FOldBrinNewService;
import com.hz.his.dto.order.OrderInitVo;
import com.hz.his.dto.order.OrderPHisDto;
import com.hz.his.dto.order.PayAmountDto;
import com.hz.his.dto.order.PayDto;
import com.hz.his.dto.order.*;
import com.platform.constants.LoginConstant;
import com.platform.entity.ThirtApplication;
import com.platform.exception.PlatTipsException;
@@ -499,6 +496,18 @@
            throw new PlatTipsException(PlatformCode.ERROR_TIPS,"根据总订单未找到订单其他信息");
        }

        //20240730 彭程需求：订单结账可支持其他文件上传
        if(payDto.getOtherInfoFiles()!=null && payDto.getOtherInfoFiles().size()!=0){
            for (OrderOtherFilesDto dto: payDto.getOtherInfoFiles()) {
                if(StringUtils.isEmpty(dto.getFileType())){
                    throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"文件类型为空！");
                }
                if(StringUtils.isEmpty(dto.getFileUrl())){
                    throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"文件为空！");
                }
            }
        }

    }



 phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderRefundServiceImpl.java

@@ -1129,6 +1129,13 @@
                }
            }
        }


        //是否归还商品
        if(orderRefundDto.getIsReturnBack()!=null){
            refundRecord.setIsReturnBack(orderRefundDto.getIsReturnBack());
        }

        refundRecordService.insert(refundRecord);

        if(refundRecordMethodList != null){

 phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderServiceV2Impl.java

@@ -606,6 +606,13 @@
            //更新总订单状态、金额信息、记录日志
            OrderPayUtil.payHandleOrderTotal(operator, ordersTotal, payTotal, payRecharge, couponAfterAmount
                    ,payIncrement,actualTotalPoints,integralDeduction,integralCash,commonService);

            //处理订单上传的其他文件信息
            if (payDto.getOtherInfoFiles() != null && payDto.getOtherInfoFiles().size() > 0) {
                logger.info("---处理结账上传的其他类型文件---");
                OrderPayUtil.handOtherFile(ordersTotal.getId(), payDto.getOtherInfoFiles(), commonService);
            }

            orderNodeBuilder.append("-结束处理订单基本信息");

            //--非常重要：结账成功之后，重新算订单部分金额信息。注意：该程序只能运行一次

 phi_platform_user/src/main/java/com/hx/phip/util/api/OrderPayUtil.java

@@ -23,6 +23,7 @@
import com.hx.phiappt.model.limit.LimitTotal;
import com.hx.phiappt.model.order.OrderItem;
import com.hx.phiappt.model.order.OrderItemSon;
import com.hx.phiappt.model.order.OrdersOtherFileRelation;
import com.hx.phiappt.model.order.OrdersTotal;
import com.hx.phiappt.model.user.UserCard;
import com.hx.phiappt.model.user.UserCardUsed;
@@ -41,6 +42,7 @@
import com.hz.crm.dto.coupon.CouponGoodsDto;
import com.hz.crm.dto.coupon.CouponInfoDto;
import com.hz.crm.feign.FGoodsSkuService;
import com.hz.his.dto.order.OrderOtherFilesDto;
import com.platform.constants.PlatformPattern;
import com.platform.exception.PlatTipsException;
import com.platform.resultTool.PlatformCode;
@@ -1230,4 +1232,16 @@
        }
        return isPass;
    }

    /*** 处理结账上传的文件 **/
    public static void handOtherFile(String orderId, List<OrderOtherFilesDto> orderOtherFilesDto,CommonService commonService){

        orderOtherFilesDto.forEach(f -> {
            OrdersOtherFileRelation ordersOtherFileRelation = new OrdersOtherFileRelation();
            BeanUtils.copyProperties(f,ordersOtherFileRelation);
            ordersOtherFileRelation.setOrderId(orderId);
            commonService.insert(OrdersOtherFileRelationMapper.class, ordersOtherFileRelation);
        });

    }
}