Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-universal/xx-universal-server/src/sql/member_info.sql

+DROP TABLE IF EXISTS `member_info`;
+CREATE TABLE `member_info` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(10) NOT NULL COMMENT '姓名',
+  `sex` tinyint(1) NOT NULL COMMENT '性别(0:男,1:女)',
+  `card_number` varchar(50) DEFAULT NULL COMMENT '卡号',
+  `birthday` datetime DEFAULT NULL COMMENT '生日',
+  `id_number` varchar(20) DEFAULT NULL COMMENT '身份证号',
+  `certificate_address` varchar(100) DEFAULT NULL COMMENT '证件地址',
+  `email` varchar(100) DEFAULT NULL COMMENT '电子邮件',
+  `wx` varchar(100) DEFAULT NULL COMMENT '微信',
+  `member_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '会员类型(0:会员,1:VIP会员,2:砖石会员)',
+  `telephone` varchar(20) DEFAULT NULL COMMENT '联系电话',
+  `mobile_phone` varchar(20) DEFAULT NULL COMMENT '手机',
+  `address` varchar(255) DEFAULT NULL COMMENT '常住地址',
+  `workplace` varchar(255) DEFAULT NULL COMMENT '工作单位',
+  `job` varchar(100) DEFAULT NULL COMMENT '职务',
+  `inviter` varchar(100) DEFAULT NULL COMMENT '邀约人',
+  `profession` varchar(20) DEFAULT NULL COMMENT '职业',
+  `pay_type` tinyint(4) DEFAULT NULL COMMENT '支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)',
+  `member_signature_date` datetime DEFAULT NULL COMMENT '会员签名日期',
+  `manager` varchar(20) DEFAULT NULL COMMENT '经理',
+  `manager_signature_date` datetime DEFAULT NULL COMMENT '经理签名日期',
+  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建日期',
+  `create_user_id` int NOT NULL COMMENT '创建人用户id',
+  `create_user_name` varchar(50) NOT NULL COMMENT '创建人姓名',
+  `state` tinyint(4) NOT NULL DEFAULT 0 COMMENT '会员状态(-1:停用,0:未审核,1:正常)',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+
+DROP TABLE IF EXISTS `member_family_info`;
+CREATE TABLE `member_family_info` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) NOT NULL,
+  `name` varchar(10) NOT NULL COMMENT '姓名',
+  `relationship` varchar(10) NOT NULL COMMENT '关系',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
\ No newline at end of file

xx-universal/xx-universal-server/src/test/java/com/xxfc/platform/order/MemberApplicationTests.java

+package com.xxfc.platform.order;
+
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class MemberApplicationTests {
+}

xx-universal/xx-universal-server/src/test/java/com/xxfc/platform/order/controller/MemberInfoControllerTest.java

+package com.xxfc.platform.order.controller;
+
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.msg.TableResultResponse;
+import com.xxfc.platform.order.MemberApplicationTests;
+import com.xxfc.platform.universal.controller.MemberInfoController;
+import com.xxfc.platform.universal.vo.MemberFamilyInfoVo;
+import com.xxfc.platform.universal.vo.MemberInfoVo;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static com.xxfc.platform.universal.entity.MemberInfo.SEX_MAN;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class MemberInfoControllerTest extends MemberApplicationTests {
+
+    private MemberInfoVo memberInfoVo;
+
+    @Autowired
+    private MemberInfoController controller;
+
+    @Before
+    public void setUp() throws Exception {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
+
+        memberInfoVo = new MemberInfoVo();
+        memberInfoVo.setId(1);
+        memberInfoVo.setName("张三");
+        memberInfoVo.setSex(SEX_MAN);
+        memberInfoVo.setCardNumber("123456789");
+        memberInfoVo.setBirthday(sdf.parse("1988-01-01"));
+        memberInfoVo.setIdNumber("421000000000000000");
+        memberInfoVo.setCertificateAddress("皇后大道");
+        memberInfoVo.setEmail("xxxxx@xxx.com");
+        memberInfoVo.setWx("13312341234");
+        memberInfoVo.setMemberType((byte) 0);
+        memberInfoVo.setTelephone("0769-22223333");
+        memberInfoVo.setMobilePhone("13312341234");
+        memberInfoVo.setAddress("皇后大道东");
+        memberInfoVo.setWorkplace("皇后大道西");
+        memberInfoVo.setJob("test");
+        memberInfoVo.setInviter("nothing");
+        memberInfoVo.setProfession("test");
+        memberInfoVo.setPayType((byte) 0);
+        memberInfoVo.setMemberSignatureDate(new Date());
+        memberInfoVo.setManager("XXX");
+        memberInfoVo.setManagerSignatureDate(new Date());
+//        memberInfoVo.setCreateDate(new Date());
+        memberInfoVo.setCreateUserId(1);
+        memberInfoVo.setCreateUserName("admin");
+        memberInfoVo.setState((byte) 1);
+
+        List<MemberFamilyInfoVo> family = new ArrayList<>();
+        MemberFamilyInfoVo father = new MemberFamilyInfoVo();
+        father.setName("张二");
+        father.setRelationship("父子");
+        family.add(father);
+        MemberFamilyInfoVo mother = new MemberFamilyInfoVo();
+        mother.setName("李二");
+        mother.setRelationship("母子");
+        family.add(mother);
+
+        memberInfoVo.setFamily(family);
+
+    }
+
+    @Test
+    public void t_001_insert() {
+//        BaseResponse response = controller.insert(memberInfoVo);
+//        Assert.assertEquals(200, response.getStatus());
+    }
+
+    @Test
+    public void t_002_get() {
+//        ObjectRestResponse<MemberInfoVo> response = controller.get(memberInfoVo.getId());
+//        Assert.assertEquals(200, response.getStatus());
+//        Assert.assertNotNull(response.getData());
+//        Assert.assertEquals("张三", response.getData().getName());
+    }
+
+
+
+    @Test
+    public void t_003_update() {
+//        String eMail = "test@qq.com";
+//        MemberInfoVo member = controller.get(memberInfoVo.getId()).getData();
+//        List<MemberFamilyInfoVo> family = member.getFamily();
+//        MemberFamilyInfoVo family1 = family.get(0);
+//        family1.setId(null);
+//        family1.setName("大熊");
+//        family1.setRelationship("兄弟");
+//        MemberFamilyInfoVo family2 = family.get(1);
+//        family2.setName("熊二");
+//        family2.setRelationship("兄弟");
+//        member.setEmail(eMail);
+//        BaseResponse response = controller.update(member);
+//        Assert.assertEquals(200, response.getStatus());
+//        ObjectRestResponse<MemberInfoVo> resp = controller.get(memberInfoVo.getId());
+//        Assert.assertEquals(eMail, resp.getData().getEmail());
+//
+//        List<MemberFamilyInfoVo> familyInfos = resp.getData().getFamily();
+//        for (MemberFamilyInfoVo info : familyInfos) {
+//            Assert.assertTrue(family1.getName().equals(info.getName())
+//                    || family2.getName().equals(info.getName()));
+//        }
+
+    }
+
+    @Test
+    public void t_004_getAll() {
+//        TableResultResponse<MemberInfoVo> response = controller.getAll(null,1, 10);
+//        Assert.assertEquals(200, response.getStatus());
+//        Assert.assertTrue(response.getData().getRows().size() > 0);
+    }
+
+    @Test
+    public void t_005_delete() {
+//        BaseResponse response = controller.delete(memberInfoVo.getId());
+//        Assert.assertEquals(200, response.getStatus());
+    }
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCata.java

@@ -13,8 +13,8 @@ public class VehicleCata {
     private Integer id;
 
     //车型id
-    @Column(name = "vehicle_id")
-    private Integer vehicleId;
+    @Column(name = "vehicle_model_id")
+    private Integer vehicleModelId;
     //分类id
     @Column(name = "cata_id")
     private Integer cataId;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/UsableVehicleVO.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Data
 public class UsableVehicleVO {
         //车辆id
-//        String vehicleId;
+//        String vehicleModelId;
         Vehicle vehicle;
 
         BigDecimal distance;

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -44,11 +44,11 @@
         v.manufacturer,
         v.receive_time,
         v.update_time
-        <if test=" yearMonthAndParam !=null ">
+        <if test=" yearMonthAndParam != null ">
             ,vbi.booked_date
         </if>
         from vehicle v
-        <if test=" yearMonthAndParam !=null  ">
+        <if test=" yearMonthAndParam != null  ">
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
@@ -218,6 +218,28 @@
         order by v.code
     </select>
 
+    <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"
+            parameterType="com.xxfc.platform.vehicle.vo.AddOrUpdateVehicleVo">
+        select
+            v.`id`,
+            v.`code`,
+            v.number_plate
+        from vehicle v
+        where
+            `code` = #{code}
+        for update
+    </select>
+    <select id="selectByNumberPlate" resultType="com.xxfc.platform.vehicle.entity.Vehicle">
+        select * from vehicle
+        where number_plate = #{numberPlate}
+    </select>
+
+    <update id="updateStatusByIdAndStatus">
+        update vehicle
+        set status = #{status}
+        where id = #{vehicleId} and status = #{lastStatus}
+    </update>
+
     <select id="searchUsable" parameterType="java.util.Map"
             resultMap="searchUsableMap">
         select distinct vm.id as model_id, bc.id as company_id
@@ -234,6 +256,7 @@
         </if>
         left join vehicle_model vm on v.model_id = vm.id
         left join branch_company bc on v.park_branch_company_id =  bc.id
+        left join vehicle_cata vc on vm.id = vc.vehicle_model_id
         <where>
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
             <if test=" yearMonthAndParam !=null  ">
@@ -244,33 +267,18 @@
                     )
                 </foreach>
             </if>
+            <if test=" catas != null ">
+                and vc.cata_id in (
+                <foreach collection="catas" index="catasIndex" item="cata" separator=",">
+                    #{cata}
+                </foreach>
+                )
+            </if>
         </where>
         <if test="lon != null and lat != null">
-        order by
+            order by
             distance asc
         </if>
     </select>
 
-    <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"
-            parameterType="com.xxfc.platform.vehicle.vo.AddOrUpdateVehicleVo">
-        select
-            v.`id`,
-            v.`code`,
-            v.number_plate
-        from vehicle v
-        where
-            `code` = #{code}
-        for update
-    </select>
-    <select id="selectByNumberPlate" resultType="com.xxfc.platform.vehicle.entity.Vehicle">
-        select * from vehicle
-        where number_plate = #{numberPlate}
-    </select>
-
-    <update id="updateStatusByIdAndStatus">
-        update vehicle
-        set status = #{status}
-        where id = #{vehicleId} and status = #{lastStatus}
-    </update>
-
 </mapper>
\ No newline at end of file