Merge branch 'dev' into dist.1.2.0

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.xml

@@ -71,9 +71,9 @@
                case when is_aftersale=0 then '否'
                    when is_aftersale=1 then '是'
                else '未知' end isAftersale,
-               aftersales_order aftersalesOrder,
+               aftersale_order aftersaleOrder,
                aftersales_fee aftersalesFee,
-               total_fee totalFee,
+               real_total_fee totalFee,
                create_user_name createUserName,
                 case when is_changes=0 then '否'
                 when is_changes=1 then '是'

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -286,6 +286,12 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		statisticsBalanceOrderInfoEntity.setInstallFee(BigDecimal.ZERO);
 		statisticsBalanceOrderInfoEntity.setIsAftersale(isAftersales);
 		statisticsBalanceOrderInfoEntity.setAftersalesFee(aftersalesFee);
+		statisticsBalanceOrderInfoEntity.setAbnormalBalanceStatus(0);
+		statisticsBalanceOrderInfoEntity.setAbnormalBalanceFee(BigDecimal.ZERO);
+		statisticsBalanceOrderInfoEntity.setBalanceStatus(0);
+		statisticsBalanceOrderInfoEntity.setHasBalanceFee(BigDecimal.ZERO);
+		statisticsBalanceOrderInfoEntity.setNoBalanceFee(totalFeeAddAfter);
+
 		balanceOrderInfoService.save(statisticsBalanceOrderInfoEntity);
 
 		Long balanceOrderId = statisticsBalanceOrderInfoEntity.getId();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -387,8 +387,8 @@
                lbfc2.category_id costCategoryId,
                IFNULL(lbfc2.category,'其他') costCategoryName
         from logpm_trunkline_advance_detail ltad
-        left join logpm_basicdata_factory_category lbfc1 on lbfc1.brand = ltad.brand and lbfc1.firsts = ltad.first_pack_name and lbfc1.seconds = ltad.second_pack_name and lbfc1.thirds = ltad.third_pack_name and lbfc1.type = 1 AND lbfc1.materiel_name = ltad.material_name
-        left join logpm_basicdata_factory_category lbfc2 on lbfc2.brand = ltad.brand and lbfc2.firsts = ltad.first_pack_name and lbfc2.seconds = ltad.second_pack_name and lbfc2.thirds = ltad.third_pack_name and lbfc1.type = 2 AND lbfc2.materiel_name = ltad.material_name
+        left join logpm_basicdata_factory_category lbfc1 on lbfc1.brand = ltad.brand and IFNULL(lbfc1.firsts,1) = IFNULL(ltad.first_pack_name,1) and IFNULL(lbfc1.seconds,2) = IFNULL(ltad.second_pack_name,2) and IFNULL(lbfc1.thirds,3) = IFNULL(ltad.third_pack_name,3) and lbfc1.type = 1 AND IFNULL(lbfc1.materiel_name,4) = IFNULL(ltad.material_name,4)
+        left join logpm_basicdata_factory_category lbfc2 on lbfc2.brand = ltad.brand and IFNULL(lbfc2.firsts,1) = IFNULL(ltad.first_pack_name,1) and IFNULL(lbfc2.seconds,2) = IFNULL(ltad.second_pack_name,2) and IFNULL(lbfc2.thirds,3) = IFNULL(ltad.third_pack_name,3) and lbfc1.type = 2 AND IFNULL(lbfc2.materiel_name,4) = IFNULL(ltad.material_name,4)
         where ltad.is_deleted = 0
         <if test="param.advanceIds != null and param.advanceIds.size() > 0">
             and ltad.advance_id in