beauty-erp.git - Gitblit

			@@ -775,17 +775,26 @@
			Map<String, Integer> goodCZK = getRedisIds("shopping_goods_czk");
			Map<String, Integer> goodZHK = getRedisIds("shopping_goods_zhk");
			Map<String, Integer> shopIds = getRedisIds("shopId");
			Map<String, Integer> sysUsers = getRedisIds("sys_user");
			Map<String, Integer> sysUsers = getRedisIds("sys_users");
			Map<String, Integer> vipInfos = getRedisIds("vip_info");
			for (SysOrder order : orders) {
			List<Map<String, Object>> itemsMap = jdbcTemplate.queryForList("select * from sys_order_item where ORDER_ID=" + order.getId());

			Integer shopId = shopIds.get(order.getShopId().toString());
			order.setShopId(shopId.longValue());

			Integer statffId = sysUsers.get(order.getStaffId().toString());
			order.setStaffId(statffId.longValue());
			if (statffId != null) {
			order.setStaffId(statffId.longValue());
			} else {
			order.setStaffId(-order.getStaffId());
			}
			Integer vipId = vipInfos.get(order.getVipId().toString());
			order.setVipId(vipId.longValue());
			if (vipId != null) {
			order.setVipId(vipId.longValue());
			} else {
			order.setVipId(-order.getVipId());
			}

			order.setCompanyId(companyId);

			@@ -819,24 +828,46 @@
			case "家居产品" :
			Map<String, Object> skuMap = jdbcTemplate.queryForMap("select * from shopping_goods_assemble where id=" + item.getAssembleId());
			Long skuId = (Long) skuMap.get("assemble_sku_id");
			item.setGoodsId(goodsSku.get(skuId.toString()).longValue());
			Integer skuGoodsId = goodsSku.get(skuId.toString());
			if (skuGoodsId != null) {
			item.setGoodsId(skuGoodsId.longValue());
			} else {
			item.setGoodsId(-item.getAssembleId());
			}
			break;
			case "项目" :
			Map<String, Object> projMap = jdbcTemplate.queryForMap("select * from shopping_goods_assemble where id=" + item.getAssembleId());
			Long projId = (Long) projMap.get("assemble_proj_id");
			item.setGoodsId(goodProj.get(projId.toString()).longValue());
			Integer projGoodsId = goodProj.get(projId.toString());
			if (projGoodsId != null) {
			item.setGoodsId(projGoodsId.longValue());
			} else {
			item.setGoodsId(-item.getAssembleId());
			}
			break;
			case "套餐" :
			Integer tcId = goodTc.get(item.getGoodsId().toString());
			item.setGoodsId(tcId.longValue());
			if (tcId != null) {
			item.setGoodsId(tcId.longValue());
			} else {
			item.setGoodsId(-item.getGoodsId());
			}
			break;
			case "充值卡" :
			Integer czkId = goodCZK.get(item.getGoodsId().toString());
			item.setGoodsId(czkId.longValue());
			if (czkId != null) {
			item.setGoodsId(czkId.longValue());
			} else {
			item.setGoodsId(-item.getGoodsId());
			}
			break;
			case "综合卡" :
			Integer zhkId = goodZHK.get(item.getGoodsId().toString());
			item.setGoodsId(zhkId.longValue());
			if (zhkId != null) {
			item.setGoodsId(zhkId.longValue());
			} else {
			item.setGoodsId(-item.getGoodsId());
			}
			break;
			default:
			}
			@@ -874,14 +905,26 @@
			achieve.setAchieveType("美疗师业绩");
			}
			Integer beaultId = sysUsers.get(achieve.getBeaultId().toString());
			achieve.setBeaultId(beaultId.longValue());
			if (beaultId != null) {
			achieve.setBeaultId(beaultId.longValue());
			} else {
			achieve.setBeaultId(-achieve.getBeaultId());
			}

			Integer saleId = sysUsers.get(achieve.getSaleId().toString());
			achieve.setSaleId(saleId.longValue());
			if (saleId != null) {
			achieve.setSaleId(saleId.longValue());
			} else {
			achieve.setSaleId(-achieve.getSaleId());
			}

			Integer achiVipId = vipInfos.get(achieve.getVipId().toString());
			achieve.setVipId(achiVipId.longValue());
			achieve.setGoodsCash(Double.parseDouble(achieve.getT2()));
			if (achiVipId != null) {
			achieve.setVipId(achiVipId.longValue());
			} else {
			achieve.setVipId(-achieve.getVipId());
			}
			achieve.setGoodsCash(Double.parseDouble(achieve.getT1()));
			achieve.setCompanyId(companyId);
			achieve.setShoppingGoodsId(shoppingGoodsIds.get(achieve.getShoppingGoodsId()));

			@@ -901,6 +944,7 @@
			flow.setVipId(sysOrder.getVipId());
			flow.setShopId(sysOrder.getShopId());
			flow.setCompanyId(sysOrder.getCompanyId());
			flow.setPayMethod(type);
			return flow;
			}

			@@ -925,26 +969,32 @@
			sysOrderDao.insert(sysOrder);
			orderIds.put(oldOrderId, sysOrder.getId());

			for (SysOrderItem item : sysOrder.getItems()) {
			Long oldItemId = item.getId();
			item.setOrderId(sysOrder.getId());
			item.setId(null);
			sysOrderItemDao.insert(item);
			itemIds.put(oldItemId, item.getId());
			if (CollUtil.isNotEmpty(sysOrder.getItems())) {
			for (SysOrderItem item : sysOrder.getItems()) {
			Long oldItemId = item.getId();
			item.setOrderId(sysOrder.getId());
			item.setId(null);
			sysOrderItemDao.insert(item);
			itemIds.put(oldItemId, item.getId());
			}
			}

			for (SysOrderFlow flow : sysOrder.getFlows()) {
			flow.setOrderId(oldOrderId);
			sysOrderFlowDao.insert(flow);
			if (CollUtil.isNotEmpty(sysOrder.getFlows())) {
			for (SysOrderFlow flow : sysOrder.getFlows()) {
			flow.setOrderId(oldOrderId);
			sysOrderFlowDao.insert(flow);
			}
			}

			for (AchieveNew achieveNew : sysOrder.getAchieveNews()) {
			achieveNew.setOrderId(oldOrderId);
			Long item = itemIds.get(achieveNew.getOrderItemId());
			achieveNew.setOrderItemId(item);
			}
			if (CollUtil.isNotEmpty(sysOrder.getAchieveNews())) {
			for (AchieveNew achieveNew : sysOrder.getAchieveNews()) {
			achieveNew.setOrderId(oldOrderId);
			Long item = itemIds.get(achieveNew.getOrderItemId());
			achieveNew.setOrderItemId(item);
			}

			achieveNewDao.batchInsert(sysOrder.getAchieveNews());
			achieveNewDao.batchInsert(sysOrder.getAchieveNews());
			}
			}

			redisClient.saveMapValue("order", orderIds);
			@@ -952,4 +1002,39 @@
			}
			}

			@DS("slave")
			public List<SysBedInfo> bedInfoOld() {
			List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_bed_info");
			List<SysBedInfo> beds = mapsToListBean(maps, SysBedInfo.class);

			Map<String, Integer> shopIds = getRedisIds("shopId");
			for (SysBedInfo bed : beds) {
			Integer shopId = shopIds.get(bed.getShopId().toString());
			if (shopId != null) {
			bed.setShopId(shopId.longValue());
			} else {
			bed.setShopId(-bed.getShopId());
			}
			}
			return beds;
			}

			@Autowired
			private SysBedInfoDao sysBedInfoDao;

			@Transactional(rollbackFor = Exception.class)
			public void bedInfoNew(List<SysBedInfo> list) {
			if (CollUtil.isNotEmpty(list)) {
			Map<Long, Long> map = new HashMap<>();
			for (SysBedInfo bed : list) {
			Long oldId = bed.getId();
			bed.setId(null);
			sysBedInfoDao.insert(bed);
			map.put(oldId, bed.getId());
			}

			redisClient.saveMapValue("bed_info", map);
			}
			}

			}