1.新增修改收货地址功能

2.新增货权转移地址修改判断

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/WareStore")
@@ -199,4 +201,23 @@ public class StoreController {
             return result;
         }
     }
+
+
+    /**
+     * 根据id修改(入库表,库存表)收货地址
+     */
+    @RequestMapping(value = "/modifyReceiveAddress.do")
+    public String modifyReceiveAddress(String id,String inId, String receiveAddressNew){
+        try {
+            List<String> list = Arrays.asList(id.split(","));
+            List<String> inList = Arrays.asList(inId.split(","));
+
+            result=storeService.modifyReceiveAddress(list,inList,receiveAddressNew);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
 }

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -4,6 +4,7 @@ import com.th.demo.model.ware.SplitRecord;
 import com.th.demo.model.ware.Store;
 import com.th.demo.model.ware.StoreOfWareStack;
 import com.th.demo.model.ware.TotalRecord;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -61,4 +62,14 @@ public interface StoreMapper {
     int selectByOutIdNum(String id);
 
     int updateInDtmByInId(String id,Date ChangeInDtm);
+
+    /**
+     *  修改库存表收货地址
+     */
+    int  updateAddressById(@Param("id") List<String> id,@Param( "address") String  address);
+
+    /**
+     * 修改入库表收货地址
+     */
+    int  updateInAddressById(@Param( "inId") List<String> inId,@Param( "address") String  address);
 }

src/main/java/com/th/demo/service/impl/ware/ChangeServiceImpl.java

@@ -96,7 +96,14 @@ public class ChangeServiceImpl implements ChangeService {
             num += changeRecordMapper.insert(changeRecord);
             list.get(i).setCustomer(c);
             list.get(i).setFkComponyId(fk_cus.getId());
-            list.get(i).setReceiveAddress(address);
+//            新增判断 地址为空不做处理 地址不为空时 0:清空地址 其他:更新地址
+            if (address!=null && !address.equals("")){
+                if(address.equals("0")){
+                    list.get(i).setReceiveAddress("");
+                } else {
+                    list.get(i).setReceiveAddress(address);
+                }
+            }
             num += storeMapper.updateByPrimaryKey(list.get(i));
             num += storeMapper.updateFkById(list.get(i));
             use_weight = use_weight + list.get(i).getWeight();

src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java

@@ -341,6 +341,8 @@ public class StoreServiceImpl implements StoreService {
         return result;
     }
 
+
+
     private MoveRecord getMoveRecord(Store store, Stack fromStack, Stack toStack, int layerNew, int layerOld, String userId) {
         MoveRecord moveRecord = new MoveRecord();
         moveRecord.setWareNameOld(fromStack.getWare().getName());
@@ -369,4 +371,20 @@ public class StoreServiceImpl implements StoreService {
         moveRecord.setCancelFlag("0");
         return moveRecord;
     }
+
+    /**
+     * 修改收货地址
+     * @param id
+     * @param inId
+     * @param newCustomerAddress
+     * @return
+     */
+    @Override
+    public String modifyReceiveAddress(List<String> id, List<String> inId, String newCustomerAddress) {
+//        修改库存表收货地址
+        int i = storeMapper.updateAddressById(id,newCustomerAddress);
+//        修改入库表收货地址
+        int i1 = storeMapper.updateInAddressById(inId, newCustomerAddress);
+        return result;
+    }
 }

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -2,6 +2,8 @@ package com.th.demo.service.ware;
 
 import com.th.demo.model.ware.Store;
 
+import java.util.List;
+
 public interface StoreService {
     String queryLayerByStackId(String stackId, String userId, String belongId);
 
@@ -23,4 +25,9 @@ public interface StoreService {
 
     String changeCustName(String json,String newCustomername,String newFKCustomername,
                           String userId,String belongId);
+
+    /**
+     * 修改收货地址
+     */
+    String modifyReceiveAddress(List<String> id, List<String> inId, String newCustomerAddress);
 }

src/main/resource/mapper/ware/StoreMapper.xml

@@ -581,4 +581,22 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     set add_time = #{param2,jdbcType=TIMESTAMP}
     where in_id = #{param1,jdbcType=VARCHAR}
   </update>
+
+    <update id="updateAddressById">
+        update t_ware_store
+        set receive_address = #{address,jdbcType=VARCHAR}
+        where id in
+        <foreach collection="id" item="item" index="index" open="(" separator="," close=")">
+            #{item,jdbcType=VARCHAR}
+        </foreach>
+    </update>
+
+    <update id="updateInAddressById">
+        update t_ware_in_record
+        set receive_address = #{address,jdbcType=VARCHAR}
+        where id in
+        <foreach collection="inId" item="item" index="index" open="(" separator="," close=")">
+            #{item,jdbcType=VARCHAR}
+        </foreach>
+    </update>
 </mapper>