wanghui лет назад: 8
Родитель
Сommit
0f643f0c73

+ 1 - 1
src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java

@@ -119,7 +119,7 @@ public interface MessageFromSystemMapper {
 	 * @param uid
 	 * @return
 	 */
-	String checkJPushAcc(@Param("uid")String uid);
+	String selectJPushAcc(@Param("uid")String uid);
 
 	/**
 	 * 绑定第三方账�?

+ 3 - 3
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -170,7 +170,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					mp.setMessageId(mfs.getId());
 					mp.setConsumerId(cid);
 					producerTarget.add(mp);
-					registrationId = messageFromSystemMapper.checkJPushAcc(cid);
+					registrationId = messageFromSystemMapper.selectJPushAcc(cid);
 					if(StringUtils.isNotBlank(registrationId)){
 						bo = new MessageBo();
 						bo.setMessageId(mfs.getId());
@@ -196,7 +196,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					mp.setMessageId(mfs.getId());
 					mp.setConsumerId(cid);
 					producerTarget.add(mp);
-					registrationId = messageFromSystemMapper.checkJPushAcc(cid);
+					registrationId = messageFromSystemMapper.selectJPushAcc(cid);
 					if(StringUtils.isNotBlank(registrationId)){
 						bo = new MessageBo();
 						bo.setMessageId(mfs.getId());
@@ -261,7 +261,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 							mp.setCreateTime(createTime);
 							mp.setMessageId(messageId);
 							producerTarget.add(mp);
-							registrationId = messageFromSystemMapper.checkJPushAcc(cid);
+							registrationId = messageFromSystemMapper.selectJPushAcc(cid);
 							if(StringUtils.isNotBlank(registrationId)){
 								bo = new MessageBo();
 								bo.setMessageId(message.getId());

+ 8 - 2
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -34,6 +34,7 @@ import com.goafanti.order.bo.FundingListBo;
 import com.goafanti.order.bo.OperatorActive;
 import com.goafanti.order.bo.OrderDetailBo;
 import com.goafanti.order.enums.AuditState;
+import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.IntentionSate;
 import com.goafanti.order.enums.LiquidationSate;
 import com.goafanti.order.enums.OrderAction;
@@ -84,8 +85,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setCommodityId(commodityId);
 		tOrder.setCreater(TokenManager.getUserToken().getNickname());
 		tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
-		tOrder.setBuyerId(TokenManager.getUserId());
-		tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
+		if(commodityType == CommodityType.DEMAND_PROVIDE.getTypeCode()){
+			tOrder.setBuyerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
+			tOrder.setSellerId(TokenManager.getUserId());
+		}else{
+			tOrder.setBuyerId(TokenManager.getUserId());
+			tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
+		}
 		tOrder.setCommodityMode(StringUtils.isBlank(commodityMode)?DEFAULT_COMMODITY_MODE: commodityMode);
 		tOrder.setCommodityType(commodityType);
 		tOrder.setCommodityQuantity(commodityQuantity);