xignzi006 发布系统代码

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/SalesOrderExService.java

@@ -21,26 +21,6 @@ public class SalesOrderExService extends SalesOrderServiceImpl {
         return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
     }
 
-    /**
-     * 自定义行为[Cancel]用户扩展
-     * @param et
-     * @return
-     */
-    @Override
-    @Transactional
-    public SalesOrder cancel(SalesOrder et) {
-        return super.cancel(et);
-    }
-    /**
-     * 自定义行为[Finish]用户扩展
-     * @param et
-     * @return
-     */
-    @Override
-    @Transactional
-    public SalesOrder finish(SalesOrder et) {
-        return super.finish(et);
-    }
     /**
      * 自定义行为[GenInvoice]用户扩展
      * @param et

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesOrderServiceImpl.java

@@ -72,6 +72,14 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     @Lazy
     protected cn.ibizlab.businesscentral.core.base.service.ITransactionCurrencyService transactioncurrencyService;
 
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.sales.service.logic.ISalesOrderCancelLogic cancelLogic;
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.sales.service.logic.ISalesOrderFinishLogic finishLogic;
+
     protected int batchSize = 500;
 
     @Override
@@ -140,8 +148,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     @Override
     @Transactional
     public SalesOrder cancel(SalesOrder et) {
-        //自定义代码
-        return et;
+        cancelLogic.execute(et);
+         return et ;
     }
 
     @Override
@@ -151,8 +159,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     @Override
     @Transactional
     public SalesOrder finish(SalesOrder et) {
-        //自定义代码
-        return et;
+        finishLogic.execute(et);
+         return et ;
     }
 
     @Override

businesscentral-core/src/main/resources/mapper/service/incidentcustomer/IncidentCustomerMapper.xml

@@ -29,12 +29,12 @@
 
     <!--数据查询[Account]-->
     <sql id="Account" databaseId="mysql">
-		<![CDATA[ select  accountid as customerid,  accountname as customeridyominame,  'ACCOUNT' as customeridtype  from account
+		<![CDATA[ select  accountid as customerid,  accountname as customername,  'ACCOUNT' as customertype  from account
 			]]>
     </sql>
     <!--数据查询[Contact]-->
     <sql id="Contact" databaseId="mysql">
-		<![CDATA[ select  contactid as customerid,  fullname as customeridyominame,  'CONTACT' as customeridtype  from contact
+		<![CDATA[ select  contactid as customerid,  fullname as customername,  'CONTACT' as customertype  from contact
 			]]>
     </sql>
     <!--数据查询[Default]-->

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -432,7 +432,7 @@
     "delogicname":"订单",
     "sysmoudle":{"id":"SALES","name":"Sales"},
     "dedataset":[{"id":"ByParentKey" , "name":"ByParentKey"},{"id":"Cancel" , "name":"已取消"},{"id":"Default" , "name":"DEFAULT"},{"id":"Finish" , "name":"已完成"},{"id":"Invoiced" , "name":"已开发票"}],
-    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Cancel" , "name":"取消订单" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Finish" , "name":"完成订单" , "type":"USERCUSTOM" },{"id":"GenInvoice" , "name":"创建发票" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Cancel" , "name":"取消订单" , "type":"DELOGIC" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Finish" , "name":"完成订单" , "type":"DELOGIC" },{"id":"GenInvoice" , "name":"创建发票" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
     ,    {