new

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/CargoConsignServiceImpl.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.OperationType;
 import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.IssueOrder;
@@ -54,6 +55,10 @@ public class CargoConsignServiceImpl implements CargoConsignService {
 	@Override
 	@Transactional(rollbackFor=Exception.class)
 	public void doCarry(Params params) {
+		String sign = params.getSign();
+		@SuppressWarnings("unchecked")
+		Map<String,Object> map = JSON.parseObject(sign, Map.class);
+		String hash = (String) map.get("sid");
 		Long currentTime = System.currentTimeMillis();
 		//更新【订单表】
 		params.setTransportTime(currentTime);
@@ -65,6 +70,7 @@ public class CargoConsignServiceImpl implements CargoConsignService {
 		params.setOperationTypeId(OperationType.DELIVER);
 		params.setOperatorId(params.getUserId());
 		params.setOperationTime(currentTime);
+		params.setHash(hash);
 		operationHistoryMapper.addToHistory(params);
 		boolean flag = blockChainUtil.sendBlockChain(params.getSign());
 		if(!flag) throw new RuntimeException("区块链操作失败");

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/CargoTallyServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
 import com.fuzamei.constant.OperationType;
 import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.Orders;
@@ -54,6 +55,10 @@ public class CargoTallyServiceImpl implements CargoTallyService {
 
 	@Override
 	public void confirmOrReject(Params params) {
+		String sign = params.getSign();
+		@SuppressWarnings("unchecked")
+		Map<String,Object> map = JSON.parseObject(sign, Map.class);
+		String hash = (String) map.get("sid");
 		Long currentTime = System.currentTimeMillis();
 		//更新【订单表】
 		params.setTallyTime(currentTime);
@@ -67,6 +72,7 @@ public class CargoTallyServiceImpl implements CargoTallyService {
 		if(params.getConfirmId()==0) params.setOperationTypeId(OperationType.REJECT);
 		params.setOperatorId(params.getUserId());
 		params.setOperationTime(currentTime);
+		params.setHash(hash);
 		operationHistoryMapper.addToHistory(params);
 		boolean flag = blockChainUtil.sendBlockChain(params.getSign());
 		if(!flag) throw new RuntimeException("区块链操作失败");