Explorar o código

站内信修改

anderx %!s(int64=3) %!d(string=hai) anos
pai
achega
ebd1e0fde5

+ 1 - 6
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -66,10 +66,5 @@ public interface TOrderTaskMapper {
     List<OutHighNewRetrialList> highNewRetrialList(@Param("province") String province, @Param("depId") String depId, @Param("aid") String aid,
                                                    @Param("sort") Integer sort, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    /**
-     * 获取项目的分类,目前主要用于判断是否为会员催款
-     * @param tid
-     * @return
-     */
-    Integer getProjectType(Integer tid);
+
 }

+ 0 - 6
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -2106,10 +2106,4 @@
     </if>
     desc
   </select>
-    <select id="getProjectType" resultType="java.lang.Integer">
-      select b.sort from t_order_task a
-       left join business_project bp on a.commodity_id =bp.id
-       left join business_category bc on bp.cid =bc.id
-      where  a.id= #{tid}
-      </select>
 </mapper>

+ 6 - 4
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -36,9 +36,11 @@ import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.organization.bo.OutPaymentNode;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @Component
+@RestController
 public class OrderDunTask {
 	@Autowired
 	private OrderNewService orderNewService;
@@ -114,7 +116,7 @@ public class OrderDunTask {
 	/**
 	 * 询处理需要新催款的信息
 	 */
-//	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
+	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
 	public void updateNewOrderDun(){
   		try {
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");
@@ -240,7 +242,7 @@ public class OrderDunTask {
 					td.setStartTime(date);
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderReceivables(tm.getOrderReceivables());
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b,0);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					td.setDunStatus(2);
@@ -264,7 +266,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b,0);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setOrderArrears(tm.getOrderArrears());
@@ -288,7 +290,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b,0);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setOrderReceivables(tm.getOrderReceivables());

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -206,5 +206,5 @@ public interface OrderNewService {
 	 * @param b 订单信息
 	 * @param projectType 项目类型 判断是否是会员
 	 */
-	void addNotic(Integer type, AdminListBo a, TOrderNewBo b,Integer projectType);
+	void addNotic(Integer type, AdminListBo a, TOrderNewBo b);
 }

+ 4 - 11
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -709,8 +709,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
-		Integer  projectType=tOrderTaskMapper.getProjectType(o.getTid());
-		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b,projectType);
+		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b);
 		try {
 			NewDunsendEmail(orderNo,o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
@@ -721,8 +720,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid("1");
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
-		Integer  projectType=tOrderTaskMapper.getProjectType(o.getTid());
-		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b,projectType);
+		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b);
 		try {
 			NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
@@ -1149,14 +1147,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
-	public void addNotic(Integer type, AdminListBo a, TOrderNewBo b,Integer projectType) {
+	public void addNotic(Integer type, AdminListBo a, TOrderNewBo b) {
 		StringBuffer sb=new StringBuffer();
-		if(projectType==6){
-			sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
-		}else {
-			sb=sb.append("客户名称[").append(b.getUserName()).append("], 合同编号[").append(b.getContractNo())
-					.append("] 订单编号[").append(b.getOrderNo()).append("] 操作人: ").append(a.getDepartmentName()).append("-").append(a.getName()).append("。");
-		}
+		sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
 		n.setAid(b.getSalesmanId());

+ 1 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -644,8 +644,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(pnb.getOrderNo());
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-		Integer  projectType=tOrderTaskMapper.getProjectType(pn.getTid());
-		orderNewService.addNotic(type,a,b,projectType);
+		orderNewService.addNotic(type,a,b);
 		pn.setDunStatus(1);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		//营销员名称、邮箱、订单编号、客户名称

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

@@ -49,10 +49,10 @@ avatar.upload.host=//sb.jishutao.com/upload
 #static.host=//172.16.0.53/1.2.02
 #avatar.host=//172.16.0.253
 
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.04
-#avatar.host=//172.16.0.255
-#static.host=//172.16.0.255/1.2.04
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.2.04
+avatar.host=//172.16.0.255:3000
+static.host=//172.16.0.255:3000/1.2.04
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7