From 0bb5cde966c8ea8e42291cd39e037a8a57d73bc7 Mon Sep 17 00:00:00 2001
From: fanlian <1944275521@qq.com>
Date: Wed, 9 Apr 2025 22:34:47 +0800
Subject: [PATCH] ls
---
.../module/account/realm/UserRealm.java | 6 +----
.../account/service/PasswordHelper.java | 6 +----
.../service/PermissionServiceImpl.java | 6 +----
.../account/service/RoleServiceImpl.java | 6 +----
.../account/service/UserServiceImpl.java | 6 +----
.../xmomen/module/base/entity/CdExpress.java | 5 ++--
.../module/base/service/CouponService.java | 27 ++++++++++---------
.../module/order/service/OrderService.java | 4 +--
.../PickController.java | 2 +-
.../mapper}/TbRechargeLogExample.java | 2 +-
10 files changed, 25 insertions(+), 45 deletions(-)
rename src/main/java/com/xmomen/module/pick/{entity => controller}/PickController.java (98%)
rename src/main/java/com/xmomen/module/pick/{model => entity/mapper}/TbRechargeLogExample.java (99%)
diff --git a/src/main/java/com/xmomen/module/account/realm/UserRealm.java b/src/main/java/com/xmomen/module/account/realm/UserRealm.java
index a6d2b77..f3abd93 100644
--- a/src/main/java/com/xmomen/module/account/realm/UserRealm.java
+++ b/src/main/java/com/xmomen/module/account/realm/UserRealm.java
@@ -18,11 +18,7 @@ import org.apache.shiro.util.ByteSource;
import java.util.Set;
-/**
- * User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
+
public class UserRealm extends AuthorizingRealm {
// 注入UserService
diff --git a/src/main/java/com/xmomen/module/account/service/PasswordHelper.java b/src/main/java/com/xmomen/module/account/service/PasswordHelper.java
index 259f5cc..b6b6bdb 100644
--- a/src/main/java/com/xmomen/module/account/service/PasswordHelper.java
+++ b/src/main/java/com/xmomen/module/account/service/PasswordHelper.java
@@ -5,11 +5,7 @@ import org.apache.shiro.crypto.SecureRandomNumberGenerator;
import org.apache.shiro.crypto.hash.SimpleHash;
import org.apache.shiro.util.ByteSource;
-/**
- *
User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
+
public class PasswordHelper {
// 随机数生成器
diff --git a/src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java b/src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java
index 575760c..2d2c318 100644
--- a/src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java
+++ b/src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java
@@ -7,11 +7,7 @@ import com.xmomen.framework.mybatis.dao.MybatisDao;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-/**
- *
User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
+
@Service
public class PermissionServiceImpl implements PermissionService {
diff --git a/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java b/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java
index 5662241..09d1db6 100644
--- a/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java
+++ b/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java
@@ -20,11 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-/**
- *
User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
+
@Service
public class RoleServiceImpl implements RoleService {
diff --git a/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java b/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java
index 2d3cdfc..5564b75 100644
--- a/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java
+++ b/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java
@@ -23,11 +23,7 @@ import com.xmomen.module.user.entity.SysUsersExample;
import com.xmomen.module.user.entity.SysUsersRoles;
import com.xmomen.module.user.entity.SysUsersRolesExample;
-/**
- *
User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
+
@Service
public class UserServiceImpl implements UserService {
diff --git a/src/main/java/com/xmomen/module/base/entity/CdExpress.java b/src/main/java/com/xmomen/module/base/entity/CdExpress.java
index 76f4e77..150b30c 100644
--- a/src/main/java/com/xmomen/module/base/entity/CdExpress.java
+++ b/src/main/java/com/xmomen/module/base/entity/CdExpress.java
@@ -11,13 +11,12 @@ import javax.persistence.Version;
@Entity
@Table(name = "cd_express")
public class CdExpress extends BaseMybatisModel {
- // 主键
+
private Integer id;
- // 快递编码
+
private String expressCode;
- // 快递名称
private String expressName;
@Column(name = "ID")
diff --git a/src/main/java/com/xmomen/module/base/service/CouponService.java b/src/main/java/com/xmomen/module/base/service/CouponService.java
index 46a4f52..7480406 100644
--- a/src/main/java/com/xmomen/module/base/service/CouponService.java
+++ b/src/main/java/com/xmomen/module/base/service/CouponService.java
@@ -3,6 +3,7 @@ package com.xmomen.module.base.service;
import java.math.BigDecimal;
import java.util.List;
+import lombok.val;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.util.CollectionUtils;
@@ -28,7 +29,7 @@ import com.xmomen.module.base.model.CouponQuery;
import com.xmomen.module.base.model.CouponReportModel;
import com.xmomen.module.base.model.ReadCardVo;
import com.xmomen.module.order.entity.TbTradeRecord;
-import com.xmomen.module.pick.entity.TbExchangeCardLog;
+
import com.xmomen.module.pick.entity.TbRechargeLog;
import com.xmomen.module.system.entity.SysUserOrganization;
import com.xmomen.module.wx.module.coupon.model.CouponQueryModel;
@@ -39,7 +40,7 @@ import com.xmomen.module.wx.util.DateUtils;
* Created by Jeng on 2016/3/30.
*/
@Service
-public class CouponService {
+public class CouponService {
private static Logger logger = LoggerFactory.getLogger(CouponService.class);
@Autowired
@@ -199,7 +200,7 @@ public class CouponService {
tradeRecord.setRemark("卡充值记录");
mybatisDao.save(tradeRecord);
}
-
+
/**
* 卡充值
*
@@ -216,7 +217,7 @@ public class CouponService {
coupon.setUserPrice(userPrice.add(rechargePrice));
mybatisDao.update(coupon);
-
+
/*SysUserOrganization userOrganization = new SysUserOrganization();
userOrganization.setUserId(userId);
userOrganization = mybatisDao.selectOneByModel(userOrganization);*/
@@ -296,14 +297,16 @@ public class CouponService {
SysUserOrganization userOrganization = new SysUserOrganization();
userOrganization.setUserId(userId);
userOrganization = mybatisDao.selectOneByModel(userOrganization);
- TbExchangeCardLog exchangeCardLog = new TbExchangeCardLog();
- exchangeCardLog.setNewCouponId(newCoupon.getId());
- exchangeCardLog.setNewCouponNo(newCouponNo);
- exchangeCardLog.setOldCouponId(oldCoupon.getId());
- exchangeCardLog.setOldCouponNo(oldCouponNo);
- exchangeCardLog.setRechargePlace(userOrganization.getOrganizationId());
- exchangeCardLog.setRechargeUser(userId);
- mybatisDao.save(exchangeCardLog);
+ TbExchangeCardLog exchangeCardLog;
+ exchangeCardLog = new exchangeCardLog();
+ Object clone = exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ int save;
+
}
/**
diff --git a/src/main/java/com/xmomen/module/order/service/OrderService.java b/src/main/java/com/xmomen/module/order/service/OrderService.java
index 0c2dd23..bb3da80 100644
--- a/src/main/java/com/xmomen/module/order/service/OrderService.java
+++ b/src/main/java/com/xmomen/module/order/service/OrderService.java
@@ -63,9 +63,7 @@ import com.xmomen.module.wx.module.order.model.OrderProductItem;
import com.xmomen.module.wx.module.order.model.PayOrderModel;
import com.xmomen.module.wx.module.order.service.MyOrderService;
-/**
- * Created by Jeng on 16/4/5.
- */
+
@Service
public class OrderService {
diff --git a/src/main/java/com/xmomen/module/pick/entity/PickController.java b/src/main/java/com/xmomen/module/pick/controller/PickController.java
similarity index 98%
rename from src/main/java/com/xmomen/module/pick/entity/PickController.java
rename to src/main/java/com/xmomen/module/pick/controller/PickController.java
index 2365a75..5745c64 100644
--- a/src/main/java/com/xmomen/module/pick/entity/PickController.java
+++ b/src/main/java/com/xmomen/module/pick/controller/PickController.java
@@ -1,4 +1,4 @@
-package com.xmomen.module.pick.entity;
+package com.xmomen.module.pick.controller;
// 引入用于验证请求体数据有效性的注解
diff --git a/src/main/java/com/xmomen/module/pick/model/TbRechargeLogExample.java b/src/main/java/com/xmomen/module/pick/entity/mapper/TbRechargeLogExample.java
similarity index 99%
rename from src/main/java/com/xmomen/module/pick/model/TbRechargeLogExample.java
rename to src/main/java/com/xmomen/module/pick/entity/mapper/TbRechargeLogExample.java
index 6ec4ade..9c25dbb 100644
--- a/src/main/java/com/xmomen/module/pick/model/TbRechargeLogExample.java
+++ b/src/main/java/com/xmomen/module/pick/entity/mapper/TbRechargeLogExample.java
@@ -1,4 +1,4 @@
-package com.xmomen.module.pick.model;
+package com.xmomen.module.pick.entity.mapper;
import com.xmomen.framework.mybatis.model.BaseMybatisExample;
import com.xmomen.module.pick.entity.TbPickExample;