Przeglądaj źródła

订单协单开发

anderx 4 lat temu
rodzic
commit
515dda4667

+ 5 - 0
src/main/java/com/goafanti/common/dao/TOrderAssistMapper.java

@@ -1,6 +1,9 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderAssist;
+import com.goafanti.order.bo.assistListBo;
+
+import java.util.List;
 
 public interface TOrderAssistMapper {
     int deleteByPrimaryKey(Integer id);
@@ -14,4 +17,6 @@ public interface TOrderAssistMapper {
     int updateByPrimaryKeySelective(TOrderAssist record);
 
     int updateByPrimaryKey(TOrderAssist record);
+
+    List<assistListBo> assistList(String orderNo);
 }

+ 9 - 1
src/main/java/com/goafanti/common/mapper/TOrderAssistMapper.xml

@@ -16,7 +16,8 @@
     from t_order_assist
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from t_order_assist
     where id = #{id,jdbcType=INTEGER}
   </delete>
@@ -73,4 +74,11 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="assistList" resultType="com.goafanti.order.bo.assistListBo">
+    select a.id,a.order_no orderNo,a.aid,a.create_time createTime,b.name,
+           date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes
+    from t_order_assist a left join admin b on a.aid=b.id
+    where order_no = #{orderNo}
+  </select>
 </mapper>

+ 21 - 1
src/main/java/com/goafanti/order/bo/assistListBo.java

@@ -1,4 +1,24 @@
 package com.goafanti.order.bo;
 
-public class assistListBo {
+import com.goafanti.common.model.TOrderAssist;
+
+public class assistListBo extends TOrderAssist {
+    private String name;
+    private String createTimes;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCreateTimes() {
+        return createTimes;
+    }
+
+    public void setCreateTimes(String createTimes) {
+        this.createTimes = createTimes;
+    }
 }

+ 36 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -640,6 +640,42 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
 			return res;
 		}
+		int i=orderAssistService.addAssistCheck(in);
+		if (i==-1){
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,ErrorConstants.PARAM_BEING_ERROR,"协单人员"));
+			return res;
+		}
+		if (i==-2){
+			res.getError().add(buildError("订单派单完成后不可修改"));
+			return res;
+		}
+		return res.data(orderAssistService.addAssist(in));
+	}
+	/**
+	 * 新增协单人员
+	 * @param in
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteAssist",method = RequestMethod.POST)
+	public Result deleteAssist(TOrderAssist in){
+		Result res = new Result();
+		if (in.getAid()==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"协单人"));
+			return res;
+		}
+		if (in.getOrderNo()==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
+			return res;
+		}
+		int i=orderAssistService.addAssistCheck(in);
+		if (i==-1){
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,ErrorConstants.PARAM_BEING_ERROR,"协单人员"));
+			return res;
+		}
+		if (i==-2){
+			res.getError().add(buildError("订单派单完成后不可修改"));
+			return res;
+		}
 		return res.data(orderAssistService.addAssist(in));
 	}
 

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderAssistService.java

@@ -9,4 +9,6 @@ public interface OrderAssistService {
     int addAssist(TOrderAssist in);
 
     List<assistListBo> assistList(String orderNo);
+
+    int addAssistCheck(TOrderAssist in);
 }

+ 20 - 1
src/main/java/com/goafanti/order/service/impl/OrderAssistServiceImpl.java

@@ -1,7 +1,9 @@
 package com.goafanti.order.service.impl;
 
 import com.goafanti.common.dao.TOrderAssistMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.TOrderAssist;
+import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.order.bo.assistListBo;
 import com.goafanti.order.service.OrderAssistService;
@@ -14,6 +16,8 @@ import java.util.List;
 public class OrderAssistServiceImpl extends BaseMybatisDao<TOrderAssistMapper> implements OrderAssistService {
     @Autowired
     private TOrderAssistMapper tOrderAssistMapper;
+    @Autowired
+    private TOrderNewMapper tOrderNewMapper;
     @Override
     public int addAssist(TOrderAssist in) {
         return tOrderAssistMapper.insertSelective(in);
@@ -21,6 +25,21 @@ public class OrderAssistServiceImpl extends BaseMybatisDao<TOrderAssistMapper> i
 
     @Override
     public List<assistListBo> assistList(String orderNo) {
-        return null;
+        return tOrderAssistMapper.assistList(orderNo);
+    }
+
+    @Override
+    public int addAssistCheck(TOrderAssist in) {
+        List<assistListBo> list = assistList(in.getOrderNo());
+        for (assistListBo bo : list) {
+            if (bo.getAid().equals(in.getAid())){
+                return -1;
+            }
+        }
+        TOrderNew t=tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+        if (t.getProcessStatus()>4){
+                return -2;
+        }
+        return 0;
     }
 }

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,11 +1,11 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20