ltkj_peis.git - gitblit

			@@ -238,7 +238,12 @@
			tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
			sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
			}
			transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
			if(tjFlowingWater.getDiscount()==null){
			transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),new BigDecimal(10), tjOrder.getTjNumber());
			}else {
			transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
			}

			tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
			// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
			// if (list != null) {

			@@ -921,6 +921,12 @@
			Date date1 = new Date(System.currentTimeMillis());
			String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
			tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);


			tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
			tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
			tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());

			if (isPay.equals("true")) {
			if (null != mallOrder) {
			if (mallOrder.getOrderStatus().equals(201L)) {
			@@ -942,7 +948,8 @@
			mallOrder.setOrderStatus(301L);
			mallOrderService.updateById(mallOrder);
			}
			} else {
			}
			else {
			tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
			tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
			tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
			@@ -952,17 +959,16 @@
			if (tjFlowingWaterService.save(tjFlowingWater)) {
			tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
			tjOrderService.updateById(tjOrder);


			}

			//团体
			if ("1".equals(tjOrder.getTjType())) {
			asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
			}


			//个人
			if ("2".equals(tjOrder.getTjType())) {

			//asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
			newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
			}

	ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史