来佣比对查询手工添加来佣orderId为0

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

 package com.yd.api.commission.service.impl;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yd.api.commission.service.LifeCommissionService;
@@ -12,7 +10,6 @@ import com.yd.dal.entity.commission.AgPoOrderCommission;
 import com.yd.dal.entity.commission.OrderCommissonCheck;
 import com.yd.dal.entity.customer.AclCustomerFortune;
 import com.yd.dal.entity.customer.AclInsurerBranch;
-import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.AclPractitionerSubordinateSystem;
 import com.yd.dal.entity.meta.MdDropOptions;
 import com.yd.dal.entity.order.PoOrder;
@@ -239,7 +236,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             orderId = params.getOrderId();
             if (orderId != null) {
                 PoOrder order = poOrderDALService.findByOrderId(orderId);
-                if ("1".equals(params.getCommissionPeriod())) {
+                if (order != null && "1".equals(params.getCommissionPeriod())) {
                     orderIds.add(orderId);
                     // 只有首年记录更新order表
                     this.updateOrder(order, status, loginId, checkBatch);

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -123,7 +123,7 @@
     </select>
 
     <sql id="manualCommission">
-        SELECT '' as orderId,
+        SELECT null as orderId,
                b.plan_id plan_id,
                b.product_id product_id,
                b.config_level config_level,
@@ -147,11 +147,11 @@
                oc.commission_type commissionType,
                oc.commission_item commissionItem,
                oc.practitioner_id practitionerId,
-               '' as ydBranchId,
-               '' as broker_customer_id,
+               null as ydBranchId,
+               null as broker_customer_id,
                null as policyTrackingStatus,
-               '' as coverageTerm,
-               '' as payTerm
+               null as coverageTerm,
+               null as payTerm
         from ag_po_order_commission oc
         left join ag_product_life_commission_base b on oc.commission_base_id = b.id
         where oc.order_id is null