Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -66,6 +66,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
@@ -616,12 +617,17 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         busSalesOrderService.updateById(salesOrder);
                     }
                 }
-                //修改应收未收款项表中的款项状态为02作废
-               /* if (!vehicleList.isEmpty()) {
+                //-------修改应收未收款项表中的款项状态为02作废------------
+                StateQuery stateQuery = new StateQuery();
+                List<String> busVinSidListState = new ArrayList<>();
+                if (!vehicleList.isEmpty()) {
                     vehicleList.stream().forEach(v -> {
-
+                        busVinSidListState.add(v.getSid());
                     });
-                }*/
+                    stateQuery.setKxState("02");
+                    stateQuery.setBusVinSid(busVinSidListState);
+                    ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -77,6 +77,7 @@
             </if>
             and length(furd.busVinSid)
             >0
+            and furd.kxState != '02'
         </where>
         group by furd.sid,furd.contractNo
         having receivable>0

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -106,4 +106,13 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     String selectByBusVinSid(String busVinSid);
 
     List<FinUncollectedReceivablesDetailed> selectListByBusVinSid(String busVinSid);
+
+    /**
+     * 根据销售订单车辆sid更新应收未收的款项状态
+     *
+     * @param busVinSid 销售订单车辆sid
+     * @param kxState   款项状态：01正常，02作废
+     * @return
+     */
+    int updateKxState(@Param("list") List<String> busVinSid, @Param("kxState") String kxState);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -92,6 +92,7 @@
         <where>
             ${ew.sqlSegment}
               and length(furd.busVinSid) > 0
+            and furd.kxState != '02'
         </where>
         group by furd.sid, currentReceivableMoney>0, furd.contractNo
         having currentReceivableMoney>0
@@ -324,4 +325,12 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
         select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid}
     </select>
+
+    <update id="updateKxState">
+        update fin_uncollected_receivables_detailed set kxState = #{kxState}
+        where busVinSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -163,7 +163,7 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
 
     @Override
     public ResultBean updateKxState(StateQuery stateQuery) {
-        return null;
+        return finUncollectedReceivablesDetailedService.updateKxState(stateQuery);
     }
 
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -980,4 +980,15 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
     public List<FinUncollectedReceivablesDetailed> selectListByBusVinSid(String busVinSid) {
         return baseMapper.selectListByBusVinSid(busVinSid);
     }
+
+    public ResultBean updateKxState(StateQuery stateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> busVinSid = stateQuery.getBusVinSid();
+        String kxState = stateQuery.getKxState();
+        busVinSid.removeAll(Collections.singleton(null));
+        if(!busVinSid.isEmpty()){
+            baseMapper.updateKxState(busVinSid,kxState);
+        }
+        return rb.success();
+    }
 }