兑换码 兑换

shop/src/main/java/com/zskk/shop/controller/admin/ExchangeCodeController.java

@@ -37,7 +37,7 @@ import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.service.ExchangeCodeService;
 import com.zskk.shop.service.GoodService;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Controller
 @RequestMapping("/manage/exchangecode")
@@ -76,7 +76,7 @@ public class ExchangeCodeController extends AbstractController {
 			@RequestParam("remark")String remark, @RequestParam("endtime") String endtime){
 		UserInfoBean user = this.getUserInfo();
 		
-		Integer time = ToolsUtil.parseTime(endtime, ToolsUtil.getBirthFormat());
+		Integer time = ToolUtils.parseTime(endtime, ToolUtils.getBirthFormat());
 		
 		exchangeCodeService.createExchangeCode(user.getUser(), gid, num, remark, time);
 		return new ControllerResult(Boolean.TRUE);
@@ -95,7 +95,7 @@ public class ExchangeCodeController extends AbstractController {
 		if (data == null){
 			throw new ZSKKException(ErrorConstant.PARAM_ERROR);
 		}
-		Integer time = ToolsUtil.parseTime(endtime, ToolsUtil.getBirthFormat());
+		Integer time = ToolUtils.parseTime(endtime, ToolUtils.getBirthFormat());
 		return new ControllerResult(exchangeCodeService.update(data, remark, status, time));
 	}
 	
@@ -165,7 +165,7 @@ public class ExchangeCodeController extends AbstractController {
 			row.createCell(4).setCellValue(item.getStatus().equals(ExchangeCodeService.ITEM_USE_STATUS_WAIT)? "未使用":"已使用");
 		}
 	
-		String fileName = "兑换码-" + user.getName() + "-" + user.getPhone() + "-" + ToolsUtil.formatTime(new Date(), ToolsUtil.getYYYYMMDDHHMMSS()) + ".xls";
+		String fileName = "兑换码-" + user.getName() + "-" + user.getPhone() + "-" + ToolUtils.formatTime(new Date(), ToolUtils.getYYYYMMDDHHMMSS()) + ".xls";
 		response.setHeader("content-Type", "application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment;filename="+URLEncoder.encode(fileName, "utf-8"));
         workbook.write(response.getOutputStream());

shop/src/main/java/com/zskk/shop/controller/h5/H5AppointmentController.java

@@ -30,7 +30,7 @@ import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.service.BuyOrderService;
 import com.zskk.shop.service.FamilyPeopleService;
 import com.zskk.shop.service.GoodService;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @RequestMapping("/h5/appointment")
 @Controller
@@ -83,7 +83,7 @@ public class H5AppointmentController extends AbstractController  {
 			people = new FamilyPeople();
 			people.setId(0);
 			people.setAddress("");
-			people.setCtime(ToolsUtil.getNow());
+			people.setCtime(ToolUtils.getNow());
 			people.setIsDel(0);
 			people.setUid(userBean.getUserid());
 		}else{

shop/src/main/java/com/zskk/shop/controller/h5/H5BuyOrderController.java

@@ -81,7 +81,7 @@ public class H5BuyOrderController extends AbstractController{
 	}
 	
 	@RequestMapping("/gopay/{bid}")
-	public String buy(Model model, @PathVariable("bid") Long bid){
+	public String gopay(Model model, @PathVariable("bid") Long bid){
 		BuyOrder buyOrder = buyOrderService.queryBuyOrder(bid);
 		if (buyOrder == null){
 			throw new ZSKKException(ErrorConstant.PARAM_ERROR);

shop/src/main/java/com/zskk/shop/controller/h5/H5ExchangeCodeController.java

@@ -0,0 +1,47 @@
+/**
+* @版权信息 (@copyright Copyright 2017-XXXX JDJR.COM All Right Reserved);
+* @see
+* @author 于海涛 京东金融【技术研发部-证券及营销平台研发部-营销平台研发部】
+* @version 1.0
+* @date 2018年7月19日
+*/
+
+package com.zskk.shop.controller.h5;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.zskk.shop.controller.AbstractController;
+import com.zskk.shop.controller.bean.ControllerResult;
+import com.zskk.shop.controller.bean.UserBean;
+import com.zskk.shop.dao.entry.ExchangeCode;
+import com.zskk.shop.dao.entry.ExchangeCodeItem;
+import com.zskk.shop.exception.ErrorConstant;
+import com.zskk.shop.exception.ZSKKException;
+import com.zskk.shop.service.ExchangeCodeService;
+
+@Controller
+@RequestMapping("/h5/ec")
+public class H5ExchangeCodeController  extends AbstractController {
+
+	@Autowired
+	private ExchangeCodeService exchangeCodeService;
+	
+	@RequestMapping("/exchange")
+	@ResponseBody
+	public ControllerResult exchange(@RequestParam("eicode") String eicode, @RequestParam("pwd") String pwd){
+		ExchangeCodeItem item = exchangeCodeService.queryOneExchangeCodeItem(eicode);
+		if (item == null){
+			throw new ZSKKException(ErrorConstant.EXCODE_ERROR);
+		}
+		if (!item.getEipwd().equals(pwd.toUpperCase())){
+			throw new ZSKKException(ErrorConstant.EXCODE_ERROR);
+		}
+		UserBean user 	= this.getH5User().getUser();
+		ExchangeCode ec = exchangeCodeService.queryOneExchangeCode(item.getEid());
+		return new ControllerResult(exchangeCodeService.exchange(user, ec, item));
+	}
+}

shop/src/main/java/com/zskk/shop/controller/pc/AppointmentController.java

@@ -34,7 +34,7 @@ import com.zskk.shop.service.BuyOrderService;
 import com.zskk.shop.service.FamilyPeopleService;
 import com.zskk.shop.service.GoodService;
 import com.zskk.shop.service.TJCenterService;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Controller
 @RequestMapping("/appointment")
@@ -95,7 +95,7 @@ public class AppointmentController extends AbstractController {
 			people = new FamilyPeople();
 			people.setId(0);
 			people.setAddress("");
-			people.setCtime(ToolsUtil.getNow());
+			people.setCtime(ToolUtils.getNow());
 			people.setIsDel(0);
 			people.setUid(userBean.getUserid());
 		}else{

shop/src/main/java/com/zskk/shop/exception/ErrorConstant.java

@@ -18,6 +18,6 @@ public class ErrorConstant {
 	public static final ZSKKError NO_SET_DESCRIBE		= new ZSKKError(100002, "您还没有设置商品详细");
 	public static final ZSKKError EICODE_ERROR			= new ZSKKError(100003, "兑换码不存在");
 	public static final ZSKKError USER_EXIST			= new ZSKKError(100004, "用户已存在");
-	
+	public static final ZSKKError EXCODE_ERROR			= new ZSKKError(100005, "兑换码或密码错误");
 	
 }

shop/src/main/java/com/zskk/shop/service/BannerService.java

@@ -19,7 +19,7 @@ import com.zskk.shop.dao.BannerMapper;
 import com.zskk.shop.dao.entry.Banner;
 import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 /**
  * Banner 服务类
@@ -75,7 +75,7 @@ public class BannerService {
 	 */
 	public Banner addBanner(String title, String icon, String url){
 		Banner banner = new Banner();
-		banner.setCtime(ToolsUtil.getNow());
+		banner.setCtime(ToolUtils.getNow());
 		banner.setStatus(BANNER_STATUS_OFFLINE);
 		banner.setTitle(title);
 		banner.setIcon(icon);

shop/src/main/java/com/zskk/shop/service/BuyOrderService.java

@@ -38,7 +38,7 @@ import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKError;
 import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.utils.LogUtil;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class BuyOrderService {
@@ -82,6 +82,26 @@ public class BuyOrderService {
 	 */
 	public static final Integer ORDER_STATUS_NOAPPOINTMENT = 4;
 	
+	/**
+	 * 支付类型 未知
+	 */
+	public static final Integer PAY_TYPE_NO = 0;
+	
+	/**
+	 * 支付类型 支付宝
+	 */
+	public static final Integer PAY_TYPE_ALI = 1;
+	
+	/**
+	 * 支付类型 微信
+	 */
+	public static final Integer PAY_TYPE_WX = 2;
+	
+	/**
+	 * 支付类型 兑换码
+	 */
+	public static final Integer PAY_TYPE_EXCHANGE_CODE = 3;
+	
 	@Autowired
 	private BuyOrderMapper buyOrderMapper;
 	
@@ -158,17 +178,42 @@ public class BuyOrderService {
 	 */
 	@Transactional
 	public BuyOrder buy(String uid, String uname, String uphone, GoodBase good, GoodPrice price, Integer num){
+		return this.buy(uid, uname, uphone, good, price, num, "", PAY_STATUS_WAIT_PAY, PAY_TYPE_NO);
+	}
+	
+	/**
+	 * 购买商品
+	 * @param uid
+	 * @param uname
+	 * @param uphone
+	 * @param good
+	 * @param price
+	 * @param num
+	 * @param payStatus
+	 * @param payType
+	 * @return
+	 */
+	@Transactional
+	public BuyOrder buy(String uid, String uname, String uphone, GoodBase good, GoodPrice price, Integer num, String orderid, Integer payStatus, Integer payType){
 		BigDecimal totalPrice = price.getDiscountPrice().multiply(new BigDecimal(num));
-		Integer now 		= ToolsUtil.getNow();
+		Integer now 		= ToolUtils.getNow();
 		BuyOrder buyOrder 	= new BuyOrder();
 		buyOrder.setCtime(now);
-		buyOrder.setPayStatus(PAY_STATUS_WAIT_PAY);
+		buyOrder.setPayStatus(payStatus);
 		buyOrder.setPtime(0);
 		buyOrder.setUid(uid);
 		buyOrder.setUname(uname);
 		buyOrder.setUphone(uphone);
 		buyOrder.setTotalPrice(totalPrice);
 		buyOrder.setIsDel(DEL_STATUS_NO);
+		buyOrder.setPaytype(payType);
+		buyOrder.setOrderid(orderid);
+		if (payStatus.equals(PAY_STATUS_PAYED)){
+			buyOrder.setPtime(now);
+		}else{
+			buyOrder.setPtime(0);
+		}
+		
 		buyOrderMapper.addBuyOrder(buyOrder);
 		
 		List<BuyOrderItem> items = new ArrayList<>();
@@ -195,7 +240,7 @@ public class BuyOrderService {
 		BuyOrder buyOrder = buyOrderMapper.queryByOrderid(orderid);
 		if (buyOrder != null && buyOrder.getTotalPrice().compareTo(new BigDecimal(money)) == 0){
 			buyOrder.setPayStatus(PAY_STATUS_PAYED);
-			buyOrder.setPtime(ToolsUtil.getNow());
+			buyOrder.setPtime(ToolUtils.getNow());
 			buyOrderMapper.updateBuyOrder(buyOrder);
 			return Boolean.TRUE;
 		}else{
@@ -279,7 +324,7 @@ public class BuyOrderService {
 		
 		item.setIsRefund(1);
 		item.setRefundid(refundid);
-		item.setRefundTime(ToolsUtil.getNow());
+		item.setRefundTime(ToolUtils.getNow());
 		buyOrderMapper.setItemRefund(item);
 		familyPeopleService.setItemRefund(item, -3);
 		return Boolean.TRUE;
@@ -296,7 +341,7 @@ public class BuyOrderService {
 		etime.add(Calendar.MONTH, 1);
 		
 		BuyOrderBean bean = new BuyOrderBean();
-		bean.setCtime(ToolsUtil.formatTime(buyOrder.getCtime(), ToolsUtil.getUseTimeFormat()));
+		bean.setCtime(ToolUtils.formatTime(buyOrder.getCtime(), ToolUtils.getUseTimeFormat()));
 		bean.setId(buyOrder.getId());
 		bean.setIsDel(buyOrder.getIsDel());
 		bean.setPayStatus(buyOrder.getPayStatus());
@@ -306,7 +351,7 @@ public class BuyOrderService {
 		bean.setUname(buyOrder.getUname());
 		bean.setUphone(buyOrder.getUphone());
 		bean.setAppointmentNum(buyOrder.getAppointmentNum());
-		bean.setEtime(ToolsUtil.formatTime(etime.getTime(), ToolsUtil.getUseTimeFormat()));
+		bean.setEtime(ToolUtils.formatTime(etime.getTime(), ToolUtils.getUseTimeFormat()));
 		
 		List<BuyOrderItem> items 	= this.queryBuyOrderItems(buyOrder.getId());
 		bean.setItems(this.toItemBeans(items));

shop/src/main/java/com/zskk/shop/service/ExchangeCodeService.java

@@ -8,6 +8,7 @@
 
 package com.zskk.shop.service;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -22,12 +23,15 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.zskk.shop.controller.bean.UserBean;
 import com.zskk.shop.dao.ExchangeCodeMapper;
+import com.zskk.shop.dao.entry.BuyOrder;
 import com.zskk.shop.dao.entry.ExchangeCode;
 import com.zskk.shop.dao.entry.ExchangeCodeItem;
 import com.zskk.shop.dao.entry.ExchangeCodeItemDownloadRecord;
+import com.zskk.shop.dao.entry.GoodBase;
+import com.zskk.shop.dao.entry.GoodPrice;
 import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class ExchangeCodeService {
@@ -65,6 +69,12 @@ public class ExchangeCodeService {
 	
 	@Autowired
 	private RedisTemplate<String, String> redisTemplate;
+	
+	@Autowired
+	private BuyOrderService buyOrderService;
+	
+	@Autowired
+	private GoodService goodService;
 
 	
 	/**
@@ -97,7 +107,7 @@ public class ExchangeCodeService {
 	 */
 	@Transactional
 	public void createExchangeCode(UserBean user, Integer gid, Integer num, String remark, Integer endtime){
-		Integer now = ToolsUtil.getNow();
+		Integer now = ToolUtils.getNow();
 		
 		ExchangeCode exchangeCode = new ExchangeCode();
 		exchangeCode.setCuid(user.getUserid());
@@ -112,7 +122,7 @@ public class ExchangeCodeService {
 		exchangeCodeMapper.insertExchangeCode(exchangeCode);
 		Integer eid = exchangeCode.getId();
 		
-		String timeKey	   = ToolsUtil.formatTime(new Date(), ToolsUtil.getYYMMFormat());
+		String timeKey	   = ToolUtils.formatTime(new Date(), ToolUtils.getYYMMFormat());
 		String dayTimesKey = this.getTimesKey(timeKey);
 		Long dayTimesValue = redisTemplate.opsForValue().increment(dayTimesKey, INCREMENT_INIT_VALUE);
 		if (dayTimesValue.equals(INCREMENT_INIT_VALUE)){
@@ -168,10 +178,36 @@ public class ExchangeCodeService {
 		record.setUid(user.getUserid());
 		record.setUname(user.getName());
 		record.setEid(eid);
-		record.setCtime(ToolsUtil.getNow());
+		record.setCtime(ToolUtils.getNow());
 		exchangeCodeMapper.addDownloadRecord(record);
 	}
 	
+	/**
+	 * 兑换
+	 * @param exchangeCode
+	 * @return
+	 */
+	@Transactional
+	public BuyOrder exchange(UserBean user, ExchangeCode ec, ExchangeCodeItem item){
+		Integer now = ToolUtils.getNow();
+		item.setUtime(now);
+		item.setStatus(ITEM_USE_STATUS_USED);
+		item.setExtend("使用人:" + user.getName() + ",手机号:" + user.getPhone());
+		exchangeCodeMapper.updateExchangeCodeItems(item);
+		
+		//下单
+		GoodBase goodBase = goodService.queryOneGoodBase(ec.getGid());
+		return buyOrderService.buy(user.getUserid(), user.getName(), user.getPhone(), goodBase, this.getZeroPrice(), 1, item.getEicode(), BuyOrderService.PAY_STATUS_PAYED, BuyOrderService.PAY_TYPE_EXCHANGE_CODE);
+	}
+	
+	private GoodPrice getZeroPrice(){
+		BigDecimal zero = new BigDecimal("0");
+		GoodPrice zeroPrice = new GoodPrice();
+		zeroPrice.setPrice(zero);
+		zeroPrice.setDiscountPrice(zero);
+		return zeroPrice;
+	}
+	
 	private String getTimesKey(String timeKey){
 		return "SHOP_EXCHANGE_CODE_DAY_TIMES" + timeKey;
 	}

shop/src/main/java/com/zskk/shop/service/FAQService.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
 import com.zskk.shop.controller.bean.UserBean;
 import com.zskk.shop.dao.FAQMapper;
 import com.zskk.shop.dao.entry.FAQ;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class FAQService {
@@ -65,7 +65,7 @@ public class FAQService {
 	public void save(UserBean user, String question, String answer){
 		FAQ faq = new FAQ();
 		faq.setAnswer(answer);
-		faq.setCtime(ToolsUtil.getNow());
+		faq.setCtime(ToolUtils.getNow());
 		faq.setCuid(user.getUserid());
 		faq.setQuestion(question);
 		faq.setStatus(STATUS_ONLINE);

shop/src/main/java/com/zskk/shop/service/FamilyPeopleService.java

@@ -29,7 +29,7 @@ import com.zskk.shop.dao.entry.FamilyPeople;
 import com.zskk.shop.dao.entry.FamilyPeopleAppointment;
 import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class FamilyPeopleService {
@@ -99,7 +99,7 @@ public class FamilyPeopleService {
 	 */
 	public FamilyPeople addMyPeople(String uid, String name, String phone, String idcard, Integer sex, String birth){
 		FamilyPeople p = new FamilyPeople();
-		p.setCtime(ToolsUtil.getNow());
+		p.setCtime(ToolUtils.getNow());
 		p.setIdcard(idcard);
 		p.setName(name);
 		p.setPhone(phone);
@@ -180,7 +180,7 @@ public class FamilyPeopleService {
 		appointment.setItemid(item.getId());
 		appointment.setExtend(extend);
 		appointment.setFid(people.getId());
-		appointment.setCtime(ToolsUtil.getNow());
+		appointment.setCtime(ToolUtils.getNow());
 		familyPeopleMapper.insertAppointment(appointment);
 		Integer oldNum = order.getAppointmentNum();
 		order.setAppointmentNum(oldNum + 1);

shop/src/main/java/com/zskk/shop/service/GoodService.java

@@ -26,7 +26,7 @@ import com.zskk.shop.dao.entry.GoodAd;
 import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.dao.entry.GoodDescribe;
 import com.zskk.shop.dao.entry.GoodPrice;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class GoodService {
@@ -87,7 +87,7 @@ public class GoodService {
 	public Integer saveGoodBase(UserBean user, GoodBase base, BigDecimal price, BigDecimal discountPrice){
 		base.setSort(0);
 		base.setUid(user.getUserid());
-		base.setCtime(ToolsUtil.getNow());
+		base.setCtime(ToolUtils.getNow());
 		if (base.getGid().equals(0)){
 			base.setStatus(GOOD_OFFLINE);
 			goodMapper.addGoodBase(base);
@@ -168,7 +168,7 @@ public class GoodService {
 	 */
 	@Transactional
 	public void saveGoodDescribe(GoodBase good, List<GoodDescribe> items){
-		Integer now = ToolsUtil.getNow();
+		Integer now = ToolUtils.getNow();
 		goodMapper.delAllGoodDescribes(good.getGid());
 		for(GoodDescribe it: items){
 			it.setCtime(now);

shop/src/main/java/com/zskk/shop/service/ManagerUserService.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
 
 import com.zskk.shop.dao.ManagerUserMapper;
 import com.zskk.shop.dao.entry.ManagerUser;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class ManagerUserService {
@@ -37,7 +37,7 @@ public class ManagerUserService {
 	
 	public void add(ManagerUser user){
 		user.setStatus(1);
-		user.setCtime(ToolsUtil.getNow());
+		user.setCtime(ToolUtils.getNow());
 		managerUserMapper.add(user);
 	}
 	

shop/src/main/java/com/zskk/shop/service/RecommendGoodService.java

@@ -20,7 +20,7 @@ import com.zskk.shop.dao.RecommendGoodMapper;
 import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.dao.entry.GoodPrice;
 import com.zskk.shop.dao.entry.RecommendGood;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class RecommendGoodService {
@@ -35,7 +35,7 @@ public class RecommendGoodService {
 	public void add(Integer gid){
 		recommendGoodMapper.del(gid);
 		RecommendGood good = new RecommendGood();
-		good.setCtime(ToolsUtil.getNow());
+		good.setCtime(ToolUtils.getNow());
 		good.setFloor(1);
 		good.setGid(gid);
 		recommendGoodMapper.add(good);

shop/src/main/java/com/zskk/shop/service/ShopConfigService.java

@@ -21,7 +21,7 @@ import com.zskk.shop.dao.ShopConfigMapper;
 import com.zskk.shop.dao.entry.ShopConfig;
 import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class ShopConfigService {
@@ -106,7 +106,7 @@ public class ShopConfigService {
 			config.setKey(key);
 			config.setValue(value);
 			config.setDescription("");
-			config.setCtime(ToolsUtil.getNow());
+			config.setCtime(ToolUtils.getNow());
 			shopConfigMapper.add(config);
 		}
 	}

shop/src/main/java/com/zskk/shop/service/SysLabelService.java

@@ -19,7 +19,7 @@ import com.zskk.shop.dao.SysLabelMapper;
 import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.dao.entry.GoodLabel;
 import com.zskk.shop.dao.entry.SysLabel;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class SysLabelService {
@@ -84,7 +84,7 @@ public class SysLabelService {
 	@Transactional
 	public void saveGoodLabels(GoodBase base, List<Integer> lids){
 		sysLabelMapper.delGoodLabels(base.getGid());
-		Integer now = ToolsUtil.getNow();
+		Integer now = ToolUtils.getNow();
 		for (Integer lid: lids){
 			GoodLabel bean = new GoodLabel();
 			bean.setCtime(now);

shop/src/main/java/com/zskk/shop/service/TJCenterService.java

@@ -33,7 +33,7 @@ import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.utils.HttpClient;
 import com.zskk.shop.utils.LogUtil;
 import com.zskk.shop.utils.SecretUtil;
-import com.zskk.shop.utils.ToolsUtil;
+import com.zskk.shop.utils.ToolUtils;
 
 @Service
 public class TJCenterService {
@@ -145,7 +145,7 @@ public class TJCenterService {
 	private String doPost(String url, Map<String, String> data){
 		String main 		= JSON.toJSONString(data);
 		String nonce		= UUID.randomUUID().toString().replaceAll("-", "");
-		String timestamp 	= ToolsUtil.getNow().toString();
+		String timestamp 	= ToolUtils.getNow().toString();
 		String sign			= this.sign(main, nonce, timestamp, this.tjkey);
 		
 		Map<String, String> headers = new HashMap<>();

shop/src/main/java/com/zskk/shop/utils/ToolsUtil.java → shop/src/main/java/com/zskk/shop/utils/ToolUtils.java

@@ -8,7 +8,7 @@ import java.util.Date;
 import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
 
-public class ToolsUtil {
+public class ToolUtils {
 	
 	/**
 	 * 获取当前时间
@@ -103,9 +103,4 @@ public class ToolsUtil {
 		}
 		return (int)(format.parse(time).getTime()/1000);
 	}
-	
-
-	public static void main(String[] args){
-		System.out.println(ToolsUtil.formatTime(new Date(), ToolsUtil.getYYMMFormat()));
-	}
 }

shop/src/main/resource/mapper/BuyOrderMapper.xml

@@ -45,8 +45,8 @@
 	</select>
 	
 	<insert id="addBuyOrder" parameterType="com.zskk.shop.dao.entry.BuyOrder" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-		insert into buy_order(uid, uphone, uname, total_price, pay_status, is_del, ctime, ptime)
-		values(#{uid}, #{uphone}, #{uname}, #{totalPrice}, #{payStatus}, #{isDel}, #{ctime}, #{ptime})
+		insert into buy_order(uid, uphone, uname, total_price, pay_status, is_del, orderid, paytype, ctime, ptime)
+		values(#{uid}, #{uphone}, #{uname}, #{totalPrice}, #{payStatus}, #{isDel}, #{orderid}, #{paytype}, #{ctime}, #{ptime})
 	</insert>
 	
 	<update id="updateBuyOrder" parameterType="com.zskk.shop.dao.entry.BuyOrder">

shop/src/main/resource/mapper/ExchangeCodeMapper.xml

@@ -55,7 +55,7 @@
 		</foreach>
 	</insert>
 	<update id="updateExchangeCodeItems" parameterType="com.zskk.shop.dao.entry.ExchangeCodeItem">
-		update eicode=#{eicode},eipwd=#{eipwd}, status=#{status}, utime=#{utime}, extend=#{extend}
+		update exchange_code_item set eicode=#{eicode},eipwd=#{eipwd}, status=#{status}, utime=#{utime}, extend=#{extend}
 		where id=#{id}
 	</update>