~jiangyouyao/beauty-erp.git

			@@ -1,6 +1,6 @@
			package com.matrix.system.shopXcx.api.action;

			import com.matrix.biz.bean.BizUser;
			import com.matrix.system.hive.bean.SysVipInfo;
			import com.matrix.component.redis.RedisUserLoginUtils;
			import com.matrix.component.tools.WxUtils;
			import com.matrix.core.pojo.AjaxResult;
			@@ -110,10 +110,10 @@
			@PostMapping(value = "/saveRefundRecord")
			public @ResponseBody
			AjaxResult saveRefundRecord(@RequestBody ShopRefundRecord refundRecord) {
			BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
			SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			refundRecord.setCreateBy(loginUser.getOpenId());
			refundRecord.setUpdateBy(loginUser.getOpenId());
			refundRecord.setUserId(loginUser.getOpenId());
			refundRecord.setUserId(loginUser.getId());
			refundRecord.setCompanyId(loginUser.getCompanyId());
			refundRecord.setAuditStatus(AppConstance.REFUND_NOT_AUDITED);
			refundRecord.setRefundStatus(AppConstance.REFUND_PROCESSING);
			@@ -124,7 +124,7 @@
			refundRecord.setApplyTime(new Date());

			ShopRefundRecord record = new ShopRefundRecord();
			record.setUserId(loginUser.getOpenId());
			record.setUserId(loginUser.getId());
			record.setOrderId(refundRecord.getOrderId());
			List<ShopRefundRecord> shopRefundRecords = refundRecordDao.selectByModel(record);
			if(CollectionUtils.isNotEmpty(shopRefundRecords)){
			@@ -159,7 +159,6 @@

			if(flag){
			ShopRefundRecord fundRecord = refundRecordDao.selectById(shopRecord.getId());
			refundRecordService.sendRefundInfoToUser(fundRecord);
			refundRecordService.updateGroupBuyStatus(orderId.longValue());
			return new AjaxResult(AjaxResult.STATUS_SUCCESS, "退款成功");
			}
			@@ -186,9 +185,8 @@
			@PostMapping("/findRefundRecord")
			@ResponseBody
			public AjaxResult getRefundRecordByUserId(@RequestBody ShopRefundRecord refundRecord) {
			BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
			String userId = loginUser.getOpenId();
			refundRecord.setUserId(userId);
			SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			refundRecord.setUserId(loginUser.getId());
			List<ShopRefundRecord> list = refundRecordDao.selectByRefundUserId(refundRecord);
			AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, list, list.size());
			return result;