Merge branch 'master' of hhq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/PickUpCodeController.java

@@ -2,7 +2,6 @@ package com.kmall.admin.controller;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -16,7 +15,6 @@ import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import org.apache.commons.lang.RandomStringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -122,21 +120,6 @@ public class PickUpCodeController {
             return R.error("订单编号为空！");
         }
 
-        //生成一个 5 位的随机字符串
-        String randomCode = RandomStringUtils.randomAlphanumeric(5).toUpperCase();
-        //K： 跨境电商 ， Y：一般贸易
-        pickUpCode.setPickUpCodeSn("K-"+randomCode);
-        //  pickUpCode.setPickUpCodeSn("Y-");
-        pickUpCode.setPickUpCodeStatus("0");
-        if (pickUpCode.getPickUpCodeCreatetime()==null){
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
-            pickUpCode.setPickUpCodeCreatetime(df.format(new Date()));// new Date()为获取当前系统时间
-        }
-        pickUpCode.setModerSn(ShiroUtils.getUserEntity().getUserId().toString());
-        pickUpCode.setCreateTime(new Date());
-        pickUpCode.setModTime(new Date());
-
-
         int result = pickUpCodeService.save(pickUpCode);
         if (result <= 0 ){
             return R.error("生成取货码失败！");

kmall-admin/src/main/java/com/kmall/admin/service/impl/PickUpCodeServiceImpl.java

@@ -3,9 +3,13 @@ package com.kmall.admin.service.impl;
 import com.kmall.admin.dao.PickUpCodeDao;
 import com.kmall.admin.entity.PickUpCodeEntity;
 import com.kmall.admin.service.PickUpCodeService;
+import com.kmall.admin.utils.ShiroUtils;
+import org.apache.commons.lang.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -39,6 +43,21 @@ public class PickUpCodeServiceImpl implements PickUpCodeService {
 
     @Override
     public int save(PickUpCodeEntity pickUpCode) {
+
+        //生成一个 5 位的随机字符串
+        String randomCode = RandomStringUtils.randomAlphanumeric(5).toUpperCase();
+        //K： 跨境电商 ， Y：一般贸易
+        pickUpCode.setPickUpCodeSn("K-"+randomCode);
+        //  pickUpCode.setPickUpCodeSn("Y-");
+        pickUpCode.setPickUpCodeStatus("0");
+        if (pickUpCode.getPickUpCodeCreatetime()==null){
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
+            pickUpCode.setPickUpCodeCreatetime(df.format(new Date()));// new Date()为获取当前系统时间
+        }
+        pickUpCode.setModerSn(ShiroUtils.getUserEntity().getUserId().toString());
+        pickUpCode.setCreateTime(new Date());
+        pickUpCode.setModTime(new Date());
+
         return pickUpCodeDao.save(pickUpCode);
     }