pipIrr-SV.git - Gitblit

			@@ -67,12 +67,13 @@
			@SsoAop()
			public BaseResponse<QueryResultVo<List<VoDivide>>> getDivides(QueryVo vo){
			try {
			QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo);
			if(res.itemTotal != null && res.itemTotal > 0) {
			return BaseResponseUtils.buildSuccess(res);
			}else {
			return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_DIVIDES.getMessage());
			}
			//QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo);
			//if(res.itemTotal != null && res.itemTotal > 0) {
			// return BaseResponseUtils.buildSuccess(res);
			//}else {
			// return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_DIVIDES.getMessage());
			//}
			return BaseResponseUtils.buildSuccess(divideSv.getDivides(vo));
			} catch (Exception e) {
			log.error("获取开卡记录异常", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;

			@@ -158,7 +158,13 @@
			seCardOperate.setMoney(0f);
			seCardOperate.setCardCost(cardCost);
			seCardOperate.setPaymentId(paymentId);
			seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
			if(originalCardId != null) {
			// 补卡
			seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
			}else {
			// 开新卡
			seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
			}
			seCardOperate.setRemarks(remarks);
			seCardOperate.setOperator(operator);
			seCardOperate.setOperateDt(activeTime);

	pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史