Browse Source

订单开票审核负责人开发

anderx 3 years ago
parent
commit
f440c834b1

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

@@ -470,7 +470,7 @@
   </select>
 
   <select id="salesmanOrderInvoiceCount" resultType="java.lang.Integer">
-   select count(*) from t_order_invoice where a.status in (0,1,2,3)
+   select count(*) from t_order_invoice where status in (0,1,2,3)
 	<if test="orderNo !=null">
 	and order_no = #{orderNo,jdbcType=VARCHAR}
 	</if>

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

@@ -238,6 +238,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		t.setId(id);
 		t.setRejectReason(reason);
 		t.setStatus(examine);
+		t.setExamineName("");
 		//examine 2通过 3拒绝
 		List<String> aids = new ArrayList<>();
 		TOrderInvoice t2=tOrderInvoiceMapper.selectByPrimaryKey(id);
@@ -253,7 +254,6 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			//重新计算开票金额
 			addInvoiceLog(id,1);
 		}
-
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),0);
 		tOrderInvoiceMapper.updateByPrimaryKeySelective(t);