ls

src/main/java/com/xmomen/module/account/realm/UserRealm.java

@@ -18,11 +18,7 @@ import org.apache.shiro.util.ByteSource;
 import java.util.Set;
 
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 public class UserRealm extends AuthorizingRealm {
 
     // 注入UserService

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;
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 public class PasswordHelper {
 
     // 随机数生成器

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;
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 @Service
 public class PermissionServiceImpl implements PermissionService {
 

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;
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 @Service
 public class RoleServiceImpl implements RoleService {
 

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;
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 @Service
 public class UserServiceImpl implements UserService {
 

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")

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<TbExchangeCardLog> {
     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();
+        TbExchangeCardLog exchangeCardLog;
-        exchangeCardLog.setNewCouponId(newCoupon.getId());
+        exchangeCardLog = new exchangeCardLog();
-        exchangeCardLog.setNewCouponNo(newCouponNo);
+        Object clone = exchangeCardLog.getClass();
-        exchangeCardLog.setOldCouponId(oldCoupon.getId());
+        exchangeCardLog.getClass();
-        exchangeCardLog.setOldCouponNo(oldCouponNo);
+        exchangeCardLog.getClass();
-        exchangeCardLog.setRechargePlace(userOrganization.getOrganizationId());
+        exchangeCardLog.getClass();
-        exchangeCardLog.setRechargeUser(userId);
+        exchangeCardLog.getClass();
-        mybatisDao.save(exchangeCardLog);
+        exchangeCardLog.getClass();
+        int save;
+
     }
 
     /**

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 {
 

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;
 
 // 引入用于验证请求体数据有效性的注解
 

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;