luobang 2 gadi atpakaļ
vecāks
revīzija
b03fea5ef5

+ 1 - 1
pom.xml

@@ -116,7 +116,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>BMSTRUCK_DETAILS_ORDER</param><!--运力-->
+<!--                        <param>BMSTRUCK_DETAILS_ORDER</param>&lt;!&ndash;运力&ndash;&gt;-->
                     </tables>
                 </configuration>
                 <executions>

+ 5 - 0
src/main/java/com/steerinfo/dil/controller/BmstruckDetailsOrderController.java

@@ -494,6 +494,11 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
     public RESTfulResult updateDetailsStatus(@RequestBody Map<String,Object> map) {
         List<Integer> mapList = (List<Integer>)map.get("orderList");
         List<Map<String,Object>> amsPriceList = (List<Map<String, Object>>) map.get("amsPriceList");
+        if (map.get("updateStatus") != null && DataChange.dataToBigDecimal(map.get("updateStatus")).compareTo(new BigDecimal(1)) == 0){
+            //取消确认
+            int i = bmstruckDetailsOrderService.cancelMakeSure(mapList);
+            return success(i);
+        }
         if (amsPriceList.size()>0){
             bmstruckDetailsOrderService.insertPriceValue(amsPriceList);
         }

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java

@@ -220,4 +220,6 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
 
     int updateActuallyPlace(Map<String, Object> mapValue);
 
+    int cancelMakeSure(Integer orderId);
+
 }

+ 15 - 0
src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -1106,4 +1106,19 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         }
         return 0;
     }
+
+    public int cancelMakeSure(List<Integer> mapList) {
+        int i = 0;
+        for(Integer orderId :mapList) {
+            //BigDecimal detailId  = DataChange.dataToBigDecimal(map.get("detailId"));
+            //BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
+            //bmstruckDetailsOrder.setDetailsId(detailId);
+            //bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(1));
+            //i += bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
+            i += bmstruckDetailsOrderMapper.cancelMakeSure(orderId);
+            /*BigDecimal priceId = omstruckOrderMapper.getPriceId(orderId);
+            omstruckOrderMapper.modifyOldTime(priceId,new Date());*/
+        }
+        return i;
+    }
 }

+ 6 - 0
src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

@@ -477,6 +477,7 @@
             #{id}
         </foreach>
     </delete>
+
     <!-- 友情提示!!!-->
     <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
     <!-- 友情提示!!!-->
@@ -2405,4 +2406,9 @@
         SET ACTUALLY_ADDRESS_ID = #{placeId}
         WHERE SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </update>
+    <update id="cancelMakeSure" parameterType="java.lang.Integer">
+        UPDATE BMSTRUCK_DETAILS_ORDER BDO
+        SET BDO.WETHER_TO_STATEMENT = 0
+        WHERE BDO.ORDER_ID = #{orderId}
+    </update>
 </mapper>

+ 1 - 1
src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout