~chenjiahe/phi_platform.git

			@@ -10,6 +10,7 @@
			import com.hx.phiappt.common.OrderItemConstants;
			import com.hx.phiappt.common.OriginChannelConstants;
			import com.hx.phiappt.common.PlatformConstants;
			import com.hx.phiappt.model.order.OrdersTotal;
			import com.hx.phip.enums.SysFunctionLimitEnum;
			import com.hx.phiappt.constants.tool.TimerHandleTool;
			import com.hx.phiappt.constants.tool.UserInfoTool;
			@@ -472,14 +473,16 @@
			}
			}

			/*// 判断订单先不判断订单
			if(!StringUtils.isEmpty(userMoneyUnclaimed.getOrderId())){
			//---数据填充
			// 判断订单先不判断订单
			if(UserMoneyUnclaimed.ORDER_TYPE_ORDER.equals(userMoneyUnclaimed.getOrderType()) &&!StringUtils.isEmpty(userMoneyUnclaimed.getOrderId())){
			OrdersTotal ordersTotal = commonService.selectOneByKey(OrdersTotalMapper.class, userMoneyUnclaimed.getOrderId());
			if(ordersTotal == null){
			throw new PlatTipsException(PlatformCode.ERROR_TIPS, "主订单的信息不存在");
			if(ordersTotal != null){
			userMoneyUnclaimed.setOrderNo(ordersTotal.getOrderNo());
			}
			}

			/*
			// 判断子订单
			if(!StringUtils.isEmpty(userMoneyUnclaimed.getOrderItemId())){
			if(StringUtils.isEmpty(userMoneyUnclaimed.getOrderId())){

			@@ -135,8 +135,6 @@
			//处理总退款方式数据
			refundCarryVo = refundRecordMotnedHandle(refundCarryVo,operationId,operationNme,refundRecord,ordersTotal,commonService);



			//更改总订单退款状态
			values.clear();
			values.put("orderId",ordersTotal.getId());
			@@ -189,6 +187,9 @@
			throw new TipsException("操作失败，订单状态已发生改变！");
			}

			//爆款活动规则退款，暂时不屏蔽保存提示
			activityPageGiveIncrease(ordersTotal,refundRecord,operationId,0,commonService);

			//初始化初复诊信息
			if(OrderTotalConstants.STATUS_CANCEL == ordersTotal.getStatus()){
			// OrderUtil.reCalcOrderBothTheOneData(commonService, VisitRecordMapper.class,null,ordersTotal.getUserId(), BaseEntity.NO);

			@@ -116,6 +116,7 @@
			}
			userMoneyUnclaimed.setOperatorId(ordersTotal.getOperatorId());
			userMoneyUnclaimed.setOrderId(ordersTotal.getId());
			userMoneyUnclaimed.setOrderNo(ordersTotal.getOrderNo());
			//String remarks=StringUtils.isEmpty(ordersTotal.getRemarks())?"":ordersTotal.getRemarks();
			userMoneyUnclaimed.setIsSyncHis(isSyncHis);
			String code="guide".equals(appIdCode)?"[his助手]:":"PhiSkin".equals(appIdCode)?"[领建的单]":"[p-his]:";

	phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	phi_platform_user/src/main/java/com/hx/phip/tool/refund/PartialRefundUtil.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史