Browse Source

版本切换

anderx 3 years ago
parent
commit
6056b098da

+ 1 - 0
src/main/java/com/goafanti/common/model/InvoiceLog.java

@@ -8,6 +8,7 @@ import java.util.Date;
  * @author
  */
 public class InvoiceLog implements Serializable {
+
     /**
      * 日志id
      */

+ 3 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1009,7 +1009,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public void checkCustomer(Set<CustomerExcelBo> boSet, Set<Integer> existRows, Set<Integer> filterRows) {
 		List<User> list = null;
-		CustomerExcelBo[] bos = (CustomerExcelBo[]) boSet.toArray(new CustomerExcelBo[] {});
+		CustomerExcelBo[] bos = boSet.toArray(new CustomerExcelBo[] {});
 		for (int i = 0; i < bos.length; i++) {
 			CustomerExcelBo bo = bos[i];
 			CustomerExcelBo ceb = null;
@@ -2399,7 +2399,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			if(in.getDepId()!=null)map.put("depId",in.getDepId());
 		}
 		map.put("shiroType",in.getShiroType());
-		return (Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
+		Pagination<OutUserMianProducts> p=(Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
+		return p;
 	}
 
 	@Override

+ 1 - 0
src/main/java/com/goafanti/order/bo/NewOrderChangeBo.java

@@ -7,6 +7,7 @@ import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.model.NewOrderChange;
 
 public class NewOrderChangeBo extends NewOrderChange {
+	private static final long serialVersionUID = 1L;
 	private String createTimes;
 	private BigDecimal arrears;
 	private String paymentTimes;

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

@@ -5,7 +5,7 @@ import com.goafanti.common.model.InvoiceLog;
 import java.util.Date;
 
 public class OutInvoiceLog extends InvoiceLog {
-
+    private static final long serialVersionUID = 1L;
     private String  createTimes;
 
     private String  adminName;

+ 1 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -326,6 +326,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		newMain.setRejectName(ad.getName());
 		newMain.setAuditInfo(str.toString());
 		addpublicLog(mainPublic.getId(), status, remarks);
+		addWeChatNotice(mainPublic.getAid(),0,str.toString(),mainPublic.getId());
 		publicReleaseMapper.updateByPrimaryKeySelective(newMain);
 		PublicRelease up=new PublicRelease();
 		up.setId(id);