fix(buildpackage): 修复反向订单查询和日志问题

- 修复了 TocofsReturngoodsDetailedEntity 中 refundedAtEnd 字段的错误映射
- 优化了 SoSaleReturnPluginInitializerToC 中的日志输出
- 移除了不必要的测试代码和 TODO 注释
- 更新了 StockinOrderSearchResponse 类，添加了新的返回地址相关字段

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml

@@ -308,8 +308,8 @@
             <if test="refundedAtStart!=null and refundedAtStart!=''">
                 and refundedAt >= #{refundedAtStart}
             </if>
-            <if test="refunderAtEnd!=null and refunderAtEnd!=''">
+            <if test="refundedAtEnd!=null and refundedAtEnd!=''">
-                and refundedAt &lt;= #{refunderAtEnd}
+                and refundedAt &lt;= #{refundedAtEnd}
             </if>
 --             and sts='Y'
     </trim>

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java

@@ -362,7 +362,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                 returnGoodHeaderDetailsDataDtoArrayList = queryTocofsReturngoodsDetailed(tocofsReturngoodsDetailedEntity);
             } else {
                 Assert.state(false, "未知的场景类型!");
-            } logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+            }
+            logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
             if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
                 returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate<StockinOrderSearchResponse.StockinOrder>() {
                     @Override
@@ -2902,10 +2903,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
 
         //测试
 //        goodsRertunSonDetailsDto.setReceivedQty("1");
-
+        
         String receivedQty = goodsRertunSonDetailsDto.getReceivedQty();
-        //TODO 测试
-        receivedQty = "0";
         Assert.notNull(receivedQty, "售后订单：{} 存货明细行：{} 请求数量不能为空！", header1.getCode(), goodsRertunSonDetailsDto.getId());
         Assert.state(!"".equals(receivedQty), header1.getCode(), goodsRertunSonDetailsDto.getId());
         if ("0".equals(new BigDecimal(receivedQty).stripTrailingZeros().toPlainString())) {

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java

@@ -35,8 +35,8 @@ public class SoSaleReturnPluginInitializerToCTest {
     public void startImplement() {
 //        soSaleReturnPluginInitializerToC.startImplement(null, null);
         try {
-            String code = "LETS-RE2024122300000847";
+//            String code = "LETS-RE2024122300000847";
-            soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock");
+//            soSaleReturnPluginInitializerToC.startImplementByCode(code, "tran");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -46,7 +46,7 @@ public class SoSaleReturnPluginInitializerToCTest {
 
 
         try {
-//            soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-11-01 00:00:00", "2024-11-05 23:59:59");
+            soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-12-24 16:02:17", "2024-12-24 16:02:17","0");
 
 //            JSONObject jsonObject = new JSONObject();
 //            soSaleReturnPluginInitializerToC.executeBusiness(jsonObject);

service/src/main/java/com/hzya/frame/ttxofs/dto/stock/StockinOrderSearchResponse.java

@@ -71,6 +71,15 @@ public class StockinOrderSearchResponse extends ReturnMessageBasics {
             private RerturnGoodsOrderSearchData rerturnGoodsOrderSearchData;//OFS售后订单
             private com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto headerDetailsDto;//OFS销售订单
             private String modified;
+            private String shipFromAttentionTo;
+            private String shipFromAddress;
+            private String shipFromCountry;
+            private String shipFromState;
+            private String shipFromCity;
+            private String shipFromDistrict;
+            private String shipFromMobile;
+            private String returnWaybillCode;
+            private String returnCarrier;
         }
 
         @Data
@@ -116,6 +125,10 @@ public class StockinOrderSearchResponse extends ReturnMessageBasics {
              * 计算公式
              */
             private String def8;
+
+            private String sourceOrderCode;
+
+            private String sourceLineNum;
         }
     }
 }