--no commit message

com.zrqx.order/src/main/java/com/zrqx/order/commons/enums/interfaces/ordertype/impl/EntityOrderTypeImpl.java

@@ -54,7 +54,7 @@ public class EntityOrderTypeImpl extends OrderTypeAdapter{
 	@Override
 	public ShippingAddress getShippingAddress(Integer id) {
 		Member m = fgRedisManage.getMember();
-		Integer memberId = m.getId();
+		String memberId = m.getId();
 		CallBack<ShippingAddress> call = fgShippingAddressClient.getShippingAddress(id, memberId);
 		if (call.hasEntity()) {
 			return call.getData();

com.zrqx.order/src/main/java/com/zrqx/order/fg/client/FgShippingAddressClient.java

@@ -21,5 +21,5 @@ public interface FgShippingAddressClient {
 	 */
 	// TODO 未实现
 	@GetMapping("/shippingaddress/info")
-	CallBack<ShippingAddress> getShippingAddress(@RequestParam("id") Integer id,@RequestParam("memberId") Integer memberId);
+	CallBack<ShippingAddress> getShippingAddress(@RequestParam("id") Integer id,@RequestParam("memberId") String memberId);
 }

com.zrqx.order/src/main/java/com/zrqx/order/fg/client/hystric/FgShippingAddressClientHystric.java

@@ -15,7 +15,7 @@ public class FgShippingAddressClientHystric implements FgShippingAddressClient{
 	private static final Logger logger = LoggerFactory.getLogger(FgShippingAddressClientHystric.class);
 
 	@Override
-	public CallBack<ShippingAddress> getShippingAddress(Integer id, Integer memberId) {
+	public CallBack<ShippingAddress> getShippingAddress(Integer id, String memberId) {
 		logger.warn("FgShippingAddressClientHystric#getShippingAddress 用户id："+ memberId + ",收货地址id:"+id + ";获取收货地失败");
 		return CallBack.fail();
 	}

com.zrqx.order/src/main/java/com/zrqx/order/fg/mapper/FgOrderMapper.java

@@ -210,6 +210,6 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 			+ " group by i.goodsid,i.type "
 			+ " order by o.createTime desc "
 			+ " </script> ")
-	List<GoodsForm> listBuyGoods(String opId);
+	List<GoodsForm> listBuyGoods(@Param("memberId") String opId);
 
 }

com.zrqx.order/src/main/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java

@@ -812,7 +812,7 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
 		startPage(pageParam);
 		String opId = fgRedisManage.getOpId();
 		Order record = new Order();
-		record.setCreater(Integer.valueOf(opId));
+		record.setCreater(opId);
 		List<Order> list = fgOrderMapper.select(record);
 		final OrderInfo infoRecord = new OrderInfo();
 		List<FgInvoiceOrderPageVo> result = list.stream().map(v -> {