Browse Source

回款开发

anderx 6 years ago
parent
commit
04b3c24401

+ 3 - 1
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -94,5 +94,7 @@ public interface TemporaryReceivablesMapper {
      */
     int updateByPrimaryKey(TemporaryReceivables record);
 
-	int deleteByids(String ids);
+	int deleteByids(List<?> ids);
+
+	int deleteByaid(String aid);
 }

+ 9 - 2
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -348,8 +348,15 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   
-   <delete id="deleteByids" parameterType="java.lang.Integer">
+   <delete id="deleteByids" parameterType="java.util.List">
     delete from temporary_receivables
-    where id in (#{ids}) 
+    where id in 
+	 <foreach collection="list" index="index" item="item" open="(" separator="," close=")">   
+            #{item}   
+         </foreach>
+  </delete>
+   <delete id="deleteByaid" parameterType="java.lang.String">
+    delete from temporary_receivables
+    where aid = #{aid} 
   </delete>
 </mapper>

+ 16 - 0
src/main/java/com/goafanti/order/bo/TemporaryReceivablesBo.java

@@ -0,0 +1,16 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TemporaryReceivables;
+
+public class TemporaryReceivablesBo extends TemporaryReceivables {
+	private String receivablesTimes;
+
+	public String getReceivablesTimes() {
+		return receivablesTimes;
+	}
+
+	public void setReceivablesTimes(String receivablesTimes) {
+		this.receivablesTimes = receivablesTimes;
+	}
+
+}

+ 34 - 14
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -4,6 +4,8 @@ package com.goafanti.order.controller;
 
 
 
+import javax.annotation.Resource;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,13 +16,14 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TemporaryReceivables;
+import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.order.service.OrderReceivablesService;
 
 @RestController
 @RequestMapping(value = "/api/admin/receivables")
 public class AdminOrderReceivablesApiController extends CertifyApiController {
 	
-	@Autowired
+	@Resource
 	private OrderReceivablesService orderReceivablesService;
 	/**
 	 * 	新增预计回款信息
@@ -28,8 +31,16 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/addReceivables",method = RequestMethod.POST)
-	public Result addReceivables(TemporaryReceivables t){
+	public Result addReceivables(TemporaryReceivablesBo t){
 		Result res = new Result();
+		res=inputCheck(t, res);
+		if (!res.getError().isEmpty()) {
+			return res;
+		}
+		res.data(orderReceivablesService.addReceivables(t));
+		return res;
+	}
+	private Result inputCheck(TemporaryReceivablesBo t, Result res) {
 		if(StringUtils.isBlank(t.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号编号"));
 			return res;
@@ -38,21 +49,20 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","收款金额"));
 			return res;
 		}
-		res.data(orderReceivablesService.addReceivables(t));
+		if(t.getReceivablesTimes() == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","收款时间"));
+			return res;
+		}
 		return res;
 	}
 	/**
 	 * 	修改预计回款
 	 */
 	@RequestMapping(value = "/updateReceivables",method = RequestMethod.POST)
-	public Result updateReceivables(TemporaryReceivables t){
+	public Result updateReceivables(TemporaryReceivablesBo t){
 		Result res = new Result();
-		if(StringUtils.isBlank(t.getOrderNo())){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号编号"));
-			return res;
-		}
-		if(t.getAmount() == null){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","收款金额"));
+		res=inputCheck(t, res);
+		if (!res.getError().isEmpty()) {
 			return res;
 		}
 		res.data(orderReceivablesService.updateReceivables(t));
@@ -60,15 +70,25 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 	}
 	/**
 	 * 	删除预计回款
+	 * @param ids	逗号隔开的id
+	 * @param type	0 多个  1全部
+	 * @return
 	 */
 	@RequestMapping(value = "/deleteReceivables",method = RequestMethod.POST)
-	public Result deleteReceivables(String ids){
+	public Result deleteReceivables(String ids,Integer type){
 		Result res = new Result();
-		if(null==ids) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","id"));
+		if(type==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","删除类型"));
 			return res;
+		}else if (type==0) {
+			if(null==ids) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","id或删除量"));
+				return res;
+			}
+			res.data(orderReceivablesService.deleteReceivables(ids));
+		} else {
+			res.data(orderReceivablesService.deleteAllReceivables());
 		}
-		res.data(orderReceivablesService.deleteReceivables(ids));
 		return res;
 	}
 }

+ 5 - 3
src/main/java/com/goafanti/order/service/OrderReceivablesService.java

@@ -1,13 +1,15 @@
 package com.goafanti.order.service;
 
-import com.goafanti.common.model.TemporaryReceivables;
+import com.goafanti.order.bo.TemporaryReceivablesBo;
 
 public interface OrderReceivablesService {
 
-	int addReceivables(TemporaryReceivables t);
+	int addReceivables(TemporaryReceivablesBo t);
 
-	int updateReceivables(TemporaryReceivables t);
+	int updateReceivables(TemporaryReceivablesBo t);
 
 	int deleteReceivables(String id);
 
+	int deleteAllReceivables();
+
 }

+ 37 - 6
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -1,33 +1,64 @@
 package com.goafanti.order.service.impl;
 
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TemporaryReceivablesMapper;
-import com.goafanti.common.model.TemporaryReceivables;
+import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.order.service.OrderReceivablesService;
-
+@Service
 public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceivablesMapper> implements OrderReceivablesService{
 
 	@Autowired
 	private TemporaryReceivablesMapper	temporaryReceivablesMapper;
 	@Override
-	public int addReceivables(TemporaryReceivables t) {
+	public int addReceivables(TemporaryReceivablesBo t) {
 		t.setAid(TokenManager.getAdminId());
+		if(t.getCorporateName()==null)t.setCorporateName("");
 		t.setCreateTime(new Date());
-		t.setStatus(1);
+		t.setStatus(0);
+		if(t.getReceivablesTimes()!=null) {
+			try {
+				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+				throw new BusinessException("时间转换错误");
+			}
+		}
 		return temporaryReceivablesMapper.insertSelective(t);
 	}
 	@Override
-	public int updateReceivables(TemporaryReceivables t) {
+	public int updateReceivables(TemporaryReceivablesBo t) {
+		if(t.getReceivablesTimes()!=null) {
+			try {
+				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+				throw new BusinessException("时间转换错误");
+			}
+		}
 		return temporaryReceivablesMapper.updateByPrimaryKeySelective(t);
 	}
 	@Override
 	public int deleteReceivables(String  ids) {
-		return temporaryReceivablesMapper.deleteByids(ids);
+		 List<String> delList = new ArrayList<String>();
+	        String[] strs = ids.split(",");
+	        for (String str : strs) {
+	            delList.add(str);
+	        }
+		return temporaryReceivablesMapper.deleteByids(delList);
+	}
+	@Override
+	public int deleteAllReceivables() {
+		return temporaryReceivablesMapper.deleteByaid(TokenManager.getAdminId());
 	}
 
 }

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.21
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.21
+#avatar.host=//sb.jishutao.com
 
 #连测试
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.21
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.21
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload