Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppraiseLabeInfoDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:27
+ */
+@Data
+public class AppraiseLabeInfoDTO extends PageParam  {
+
+    private String  name;
+
+    private Integer  type;
+
+    private Integer enable;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppraiseLabelInfo.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 评价标签
+ * 
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-11-16 14:07:35
+ */
+@Data
+@Table(name = "appraise_label_info")
+public class AppraiseLabelInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("")
+    private Integer id;
+	
+	    /**
+     *  标签名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "标签名称")
+    private String name;
+	
+	    /**
+     *  分值
+     */
+    @Column(name = "point")
+	@ApiModelProperty(value = "分值")
+    private Integer point;
+	
+	    /**
+     *  1-全部，2-房车，3-机车，4-游艇，5豪车
+     */
+    @Column(name = "type")
+	@ApiModelProperty(value = "1-全部，2-房车，3-机车，4-游艇，5豪车")
+    private Integer type;
+	
+	    /**
+     *  是否启用：0、否，1、是
+     */
+    @Column(name = "enable")
+	@ApiModelProperty(value = "是否启用：0、否，1、是")
+    private Integer enable;
+	
+	    /**
+     *  是否删除：0、否，1、是
+     */
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除：0、否，1、是")
+    private Integer isDel;
+	
+	    /**
+     *  
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  规则:[{"star":1,"point":20,"level":"一般"}]
+     */
+    @Column(name = "rules")
+	@ApiModelProperty(value = "规则:[{\"star\":1,\"point\":20,\"level\":\"一般\"}]")
+    private String rules;
+	
+	    /**
+     *  排序
+     */
+    @Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+    private Integer sort;
+	
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppraiseLabelInfoBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.dto.AppraiseLabeInfoDTO;
+import com.github.wxiaoqi.security.admin.dto.CompanyApplyFindDTO;
+import com.github.wxiaoqi.security.admin.entity.CompanyInfo;
+import com.github.wxiaoqi.security.admin.vo.CompanyApplyVo;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import com.github.wxiaoqi.security.admin.entity.AppraiseLabelInfo;
+import com.github.wxiaoqi.security.admin.mapper.AppraiseLabelInfoMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 评价标签
+ *
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-11-16 14:07:35
+ */
+@Service
+@Slf4j
+@Transactional
+public class AppraiseLabelInfoBiz extends BaseBiz<AppraiseLabelInfoMapper, AppraiseLabelInfo> {
+
+    public List<AppraiseLabelInfo> getList(AppraiseLabeInfoDTO appraiseLabeInfoDTO){
+        return  mapper.selectList(appraiseLabeInfoDTO);
+    }
+
+    public ObjectRestResponse selectList(AppraiseLabeInfoDTO appraiseLabeInfoDTO){
+        PageHelper.startPage(appraiseLabeInfoDTO.getPage(), appraiseLabeInfoDTO.getLimit());
+        PageInfo<AppraiseLabelInfo> pageInfo = new PageInfo<>(getList(appraiseLabeInfoDTO));
+        return ObjectRestResponse.succ(PageDataVO.pageInfo(pageInfo));
+    }
+
+    public void saveOrUpd(AppraiseLabelInfo appraiseLabelInfo){
+        Long id = appraiseLabelInfo.getId() == null ? 0L :appraiseLabelInfo.getId();
+        if (id  > 0L ){
+            updateSelectiveById(appraiseLabelInfo);
+        }else {
+            insertSelective(appraiseLabelInfo);
+        }
+    }
+
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -261,7 +261,6 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                         amount=amount.subtract(acceptDetailed1.getDivisionAmount());
                     }
                 }
-                othderAccept(orderDetailDTO);
             }
         }
     }
@@ -296,6 +295,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             if (acceptAmount.compareTo(BigDecimal.ZERO) > 0){
                 payOrderFAccept(orderWaterDTO,orderDetailDTO);
             }
+            othderAccept(orderDetailDTO);
             log.info("订单完成分账----finishOrderWater--------orderId===" + orderId + "----amount====" + amount + "--orderType===" + orderType);
         }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppraiseLabelInfoMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.dto.AppraiseLabeInfoDTO;
+import com.github.wxiaoqi.security.admin.dto.CompanyApplyFindDTO;
+import com.github.wxiaoqi.security.admin.entity.AppraiseLabelInfo;
+import com.github.wxiaoqi.security.admin.vo.CompanyApplyVo;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 评价标签
+ * 
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-11-16 14:07:35
+ */
+public interface AppraiseLabelInfoMapper extends Mapper<AppraiseLabelInfo> {
+
+    List<AppraiseLabelInfo> selectList(AppraiseLabeInfoDTO appraiseLabeInfoDTO);
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppraiseLabelInfoController.java

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.admin.biz.AppraiseLabelInfoBiz;
+import com.github.wxiaoqi.security.admin.entity.AppraiseLabelInfo;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("app/appraiseLabelInfo")
+public class AppraiseLabelInfoController extends BaseController<AppraiseLabelInfoBiz, AppraiseLabelInfo> {
+
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminAppraiseLabelInfoController.java

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.AppraiseLabelInfoBiz;
+import com.github.wxiaoqi.security.admin.dto.AppraiseLabeInfoDTO;
+import com.github.wxiaoqi.security.admin.dto.CompanyApplyFindDTO;
+import com.github.wxiaoqi.security.admin.entity.AppraiseLabelInfo;
+import com.github.wxiaoqi.security.admin.entity.CompanyInfo;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("backstage/appraiseLabelInfo")
+public class AdminAppraiseLabelInfoController extends BaseController<AppraiseLabelInfoBiz, AppraiseLabelInfo> {
+
+    @GetMapping("tag/selectList")
+    @ApiModelProperty("标签列表")
+    public ObjectRestResponse applySelectList(AppraiseLabeInfoDTO appraiseLabeInfoDTO) {
+        return  baseBiz.selectList(appraiseLabeInfoDTO);
+    }
+
+    @PostMapping("tag/upd")
+    @ApiModelProperty("修改标签")
+    public  ObjectRestResponse upd(@RequestBody AppraiseLabelInfo appraiseLabelInfo) {
+        baseBiz.saveOrUpd(appraiseLabelInfo);
+        return ObjectRestResponse.succ();
+    }
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppraiseLabelInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.github.wxiaoqi.security.admin.mapper.AppraiseLabelInfoMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.github.wxiaoqi.security.admin.entity.AppraiseLabelInfo" id="appraiseLabelInfoMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="point" column="point"/>
+        <result property="type" column="type"/>
+        <result property="enable" column="enable"/>
+        <result property="isDel" column="is_del"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="rules" column="rules"/>
+        <result property="sort" column="sort"/>
+    </resultMap>
+
+    <select id="selectList"  resultType="com.github.wxiaoqi.security.admin.entity.AppraiseLabelInfo" parameterType="com.github.wxiaoqi.security.admin.dto.AppraiseLabeInfoDTO">
+        SELECT
+       *
+        FROM appraise_label_info a
+        where a.is_del = 0
+        <if test="name != null and  name != ''">
+            AND ( a.`name` like concat('%',#{name},'%'))
+        </if>
+        <if test="type != null ">
+            AND  a.`type`= #{type}
+        </if>
+        <if test="enable != null">
+            AND a.enable = #{enable}
+        </if>
+        order by a.upd_time DESC
+    </select>
+</mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleApplyBiz.java

@@ -62,10 +62,10 @@ public class VehicleApplyBiz extends BaseBiz<VehicleApplyMapper, VehicleApply>{
              throw  new BaseException("参数不能为空",ResultCode.FAILED_CODE);
         }
         String vehicleId=StringUtils.isBlank(vehicle.getId()) ? "" : vehicle.getId();
-       /* List<Vehicle> list=vehicleBiz.getListByExample(vehicleId,vehicle.getName());
+        List<Vehicle> list=vehicleBiz.getListByExample(vehicleId,vehicle.getNumberPlate());
         if (list.size() > 0){
-            throw  new BaseException("公司名称不能重复",ResultCode.FAILED_CODE);
-        }*/
+            throw  new BaseException("车牌号不能重复",ResultCode.FAILED_CODE);
+        }
         setPriceType(vehicle);
         VehicleApply vehicleApply=new VehicleApply();
         BeanUtils.copyProperties(vehicle,vehicleApply);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1605,18 +1605,18 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     }
 
 
-    public List<Vehicle>  getListByExample(String vehicleId,String name){
+    public List<Vehicle>  getListByExample(String vehicleId,String numberPlate){
         Example example=new Example(Vehicle.class);
-        example.createCriteria().andEqualTo("name",name).andNotEqualTo("id",vehicleId);
+        example.createCriteria().andEqualTo("numberPlate",numberPlate).andNotEqualTo("id",vehicleId);
         return  selectByExample(example);
     }
 
     public String addOrUpd(VehicleApply vehicleApply){
         String vehicleId=StringUtils.isBlank(vehicleApply.getVehicleId()) ? "" : vehicleApply.getVehicleId();
-       /* List<Vehicle> list=getListByExample(vehicleId,vehicleApply.getName());
+        List<Vehicle> list=getListByExample(vehicleId,vehicleApply.getNumberPlate());
         if (list.size() > 0){
-            throw  new BaseException("公司名称不能重复", ResultCode.FAILED_CODE);
-        }*/
+            throw  new BaseException("车牌号不能重复", ResultCode.FAILED_CODE);
+        }
         Vehicle vehicle= JSONUtil.toBean(vehicleApply.getChangeJson(),Vehicle.class);
         if (StringUtils.isNotBlank(vehicleId)){
             vehicle.setExtensionList(null);