update

db/ls_offline_payments.sql

@@ -0,0 +1,38 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : Pine
+ Source Server Type    : MySQL
+ Source Server Version : 50726
+ Source Host           : 39.108.234.18:3306
+ Source Schema         : dealer
+
+ Target Server Type    : MySQL
+ Target Server Version : 50726
+ File Encoding         : 65001
+
+ Date: 06/08/2019 22:20:24
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for ls_offline_payments
+-- ----------------------------
+DROP TABLE IF EXISTS `ls_offline_payments`;
+CREATE TABLE `ls_offline_payments`  (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `car_order_id` bigint(11) NULL DEFAULT NULL,
+  `down_payment_status` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '首付状态 0 未支付 1 已支付',
+  `invoice_path` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '发票地址',
+  `payType` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '支付方式  1 全款 2 贷款',
+  `tail_status` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '尾款状态 0 未支付 1 已经支付',
+  `delivery_path` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '交车证明',
+  `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+  `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
+  `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'N',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '线下支付详情' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

pine-admin/src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.pine.admin.PineAdminApplication
+

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/CarBackOrderServiceImpl.java

@@ -1,12 +1,10 @@
 package com.pine.admin.modules.business.service.impl;
+import java.util.*;
 
+import com.pine.common.utils.SnowflakeIdWorker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import lombok.extern.slf4j.Slf4j;
 import com.pine.common.dto.Page;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,13 +86,23 @@ public class CarBackOrderServiceImpl implements CarBackOrderService {
         return null;
     }
 
+    public static void main(String[] args) {
+//        Random random = new Random();
+//        for (int i = 0; i < 1000; i++) {
+//            System.out.println(random.nextLong(32));
+//        }
+    }
     @Override
     @Transactional
     public boolean create(CarBackOrder record) {
 
         log.info("createCarBackOrder");
         try {
-
+            Random random = new Random();
+            long l = new SnowflakeIdWorker(31L, 31L).nextId();
+            record.setBackCode(String.valueOf(l));
+            record.setStatus("1");
+            record.setCreateTime(new Date());
             int updates = carBackOrderDao.insertSelective(record);
 
             if (updates > 0) {

pine-admin/src/main/java/com/pine/admin/modules/system/controller/SysUserLoginController.java

@@ -2,19 +2,14 @@ package com.pine.admin.modules.system.controller;
 
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
-import com.pine.admin.modules.system.entity.SysPermission;
-import com.pine.admin.modules.system.entity.SysUserRole;
 import com.pine.admin.modules.system.service.SysUserRoleService;
-import com.pine.admin.modules.youpaiyun.util.MD5Utils;
 import com.pine.admin.shiro.DealerOpenIdToken;
 import com.pine.admin.shiro.ShiroUtils;
-import com.pine.admin.shiro.WxOpenIdToken;
 import com.pine.common.dto.Result;
 import com.pine.common.exception.ApiException;
-import com.pine.common.utils.CookieUtil;
+import com.pine.common.utils.Constant;
 import com.pine.common.utils.MD5Util;
 import com.pine.common.utils.PasswordEncryptorUtils;
 import com.pine.common.utils.PostUtil;
@@ -27,7 +22,6 @@ import org.apache.shiro.authc.*;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import sun.security.provider.MD5;
 
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
@@ -35,7 +29,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Api(value = "A管理员登陆", tags = {"A管理员登陆"})
@@ -114,7 +107,7 @@ public class SysUserLoginController {
             map.put("account", userCode);
             map.put("password", PasswordEncryptorUtils.md5AndBase64Encryptor(password));
 
-            String s2 = PostUtil.formUpload("http://47.100.17.208:8280/api/auth/sys-user/getShopRoleByAccountAndPassword", map, null, "");
+            String s2 = PostUtil.formUpload(Constant.LOGIN_URL, map, null, "");
             Map maps = (Map) JSON.parse(s2);
 
             if (maps.get("code").equals(-1)){

pine-admin/src/main/resources/mapper/business/CarBackOrderDao.xml

@@ -316,6 +316,6 @@
 
     <select id = "isRefund"  parameterType="java.util.Map"
             resultType="java.lang.Integer">
-  SELECT count(*) FROM ls_car_back_order where order_id  = #{orderId}
+  SELECT count(*) FROM ls_car_back_order where order_id  = #{orderId} and status !=3
     </select>
 </mapper>

pine-admin/src/test/com/pine/admin/modules/system/service/impl/SysPermissionServiceImplTest.java

@@ -0,0 +1,31 @@
+package com.pine.admin.modules.system.service.impl;
+
+import com.pine.admin.modules.system.entity.SysPermission;
+import com.pine.admin.modules.system.service.SysPermissionService;
+
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+/**
+ * @Author: Pine
+ * @Date: 2019/7/27
+ * @Email:771190883@qq.com
+ */
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SysPermissionServiceImplTest {
+
+    @Autowired
+    private SysPermissionService sysPermissionService;
+    @Test
+    public void getSysPermissionList() {
+        List<SysPermission> sysPermissionList = sysPermissionService.getSysPermissionList(null);
+    }
+}

pine-common/src/main/java/com/pine/common/utils/Constant.java

@@ -99,6 +99,7 @@ public class Constant {
 
     public static final String validatebacking= "http://shop.jetour.com.cn/admin/validatebacking.htm";
     public static final String offlineaudit= "http://shop.jetour.com.cn/admin/offlineaudit.htm";
+    public static final String LOGIN_URL= "https://dealer.jetour.com.cn/api/auth/sys-user/getShopRoleByAccountAndPassword";
 
     /**
      * 菜单类型

pine-common/src/main/java/com/pine/common/utils/SnowflakeIdWorker.java

@@ -0,0 +1,171 @@
+package com.pine.common.utils;
+
+
+/**
+ * Created by dujinkai on 17/11/02.
+ * <p>
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0<br>
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截)
+ * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId<br>
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位，为一个Long型。<br>
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
+ */
+public class SnowflakeIdWorker {
+    /**
+     * 开始时间截 (2015-01-01)
+     */
+    private final long twepoch = 1420041600000L;
+
+    /**
+     * 机器id所占的位数
+     */
+    private final long workerIdBits = 5L;
+
+    /**
+     * 数据标识id所占的位数
+     */
+    private final long datacenterIdBits = 5L;
+
+    /**
+     * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+     */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /**
+     * 支持的最大数据标识id，结果是31
+     */
+    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+    /**
+     * 序列在id中占的位数
+     */
+    private final long sequenceBits = 12L;
+
+    /**
+     * 机器ID向左移12位
+     */
+    private final long workerIdShift = sequenceBits;
+
+    /**
+     * 数据标识id向左移17位(12+5)
+     */
+    private final long datacenterIdShift = sequenceBits + workerIdBits;
+
+    /**
+     * 时间截向左移22位(5+5+12)
+     */
+    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    /**
+     * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095)
+     */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /**
+     * 工作机器ID(0~31)
+     */
+    private long workerId;
+
+    /**
+     * 数据中心ID(0~31)
+     */
+    private long datacenterId;
+
+    /**
+     * 毫秒内序列(0~4095)
+     */
+    private long sequence = 0L;
+
+    /**
+     * 上次生成ID的时间截
+     */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+
+    /**
+     * 构造函数
+     *
+     * @param workerId     工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeIdWorker(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    // ==============================Methods==========================================
+
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     *
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (datacenterId << datacenterIdShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     *
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     *
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+}